some masterserv fixes