Fixes to build and installation process.