Port few changes from MSOT HyperV