Extra fixes to make install.