Fix VR related bugs