fix up builders to properly use variable overrides