fixing network only bugs