Minor server connector changes