re-fix core/build-vars