More admin security fixes