Improvements to channel changing.