Bugfixes in SINGLE_CHANNEL