build and install fixes