build fixes
5 files changed