more build fixes

The weekly drill: a round of build_fixes...