Fix non-VR issues.