arm64: some changes to get arm64 to build