fixes for servercontext removal