andybak Mostly VR and FastUI fixes