minor edits. support XVM nightly builds 2818