Minor updates to models.py after merge