Fixed issues with networking