New build configuration fixes
4 files changed