Fixes to make the installation work.