Add gulp-util definitions, fix related