Minor server changes