Fixes to admin_model