Small fixes to models