Couple fixes for variable server hack