Minor server improvements