Fixed issues with server URL