More Installation fixes