Bug fixes - AdminGateKeeper