Further tweaks to build process for product flavors