Changes to XVM, fix