more tweaks for build