More VT fixes