Fixes for slow channel switching

This fixes and closes #2132.