Some server fixes