Various model fixes