Fix M1a, M2a and M7/M8 models.