Mostly ARM related fixes