Some admin fixes.