fixes from production
Merge branch 'special' of https://github.com/jamesmontalvo3/WatchAnalytics into special