fix builder failures
wip