build and install fixes
8 files changed