Channel Manager fixes.