Network system fixes