Minor fixes to models