Replaced watch-nospawn with contrib-watch