Some fixes to the VT