Fixes to installation