Fixes in networking