Random model fixes