Bug fixes to admin config