Made a couple of listener channel fixes.