Fixes for network communication