Model fixes and admin enhancements