Some more VT fixes