Fixes for networking