Fixed Network stuff

This time for real, I swear.