Client channel improvements