Fix alignment issues on ARM