Ensure all dependencies are watched
Merge branch 'watch-deps'