Some fixes, networking