Bug fixes for aarch64