Fix some ARM64 build issues