various fixes for hmd