Network connection bugs fixed