Export fixes in gulp build