More fixes to install