more ARM64 bugfixes