Two changes made when porting Mer to aarch64.