More fixes for big-endian architectures