Fixed gulp build issues