Installation fixes