fixes for less common server url variations