Small admin fixes