Some fixes in the build and installation.