Fixed network bugs