back port admin fixes