Fixed issues with servers other than localhost