Network bugfixes