fixes for disconnected