More model fixes.