Minor server fixes