Small server fixes