Fix some stuff with the models