fix some virtapi issues