Exports fixes in gulp build