some admin fixes