Fix apparent bugs
Fix apparent bugs

shyamalschandra/CastVideos-chrome,shyamalschandra/CastVideos-chrome,jch/CastVideos-chrome,cdcabrera/CastVideos-chrome,jch/CastVideos-chrome,cdcabrera/CastVideos-chrome