Possibly fixed some networking bugs