Fix VMX build issues.