New admin fixes