More 1.7 fixes, mostly network stuff.