Fix grunt watch and uglify tasks