Fix two more errors occurring during channel switching.