Detect and fix improper server names