fixed issues with server connectivity