tweak so head builder can work in maintenance
17 files changed