more tweaking on the build process to make it repeatable