Fixing more networking issues..