slight fixes to models