Fixes for network