bug fixes for whitney watch and listen