fixes
adminserver fix
Merge branch 'fixes'