Fixup poorly coded networking