Few fixes to the models