More admin fixes