Fixed up some model stuff