Bugfixes for new VT interface