Fixed wrong `grunt watch` sub tasks, etc