Sometimes client can recover from network loss
Interface fixes