More model fixes