Fixed little bugs with models