Model and admin fixes for deployment.