Fix mutable collections, specification of host, reverting space in NuGet.targets for now