Fixed network bugs, hopefully