Fix HVT, HVD detection logic