Minor server fixes.