Two changes necessary to build Mer for aarch64.