Bug fixes in Watch task from Grunt