Some Network Fixes