Fixes for Hyper-V