Fixes to install process