fixes for connected mode