adminserver fixes