Fixes to install system