Gulp final fixes