some more admin optimizations