Fix for potential unaligned memory accesses