Fixing networking issues