new server fixes