tweaks to build with new merge
7 files changed