simple server fixes