More small admin fixes