Installation fixes and changes