hmd support fixes