More admin fixes, last for today