feature #1685: Fix minor bugs in VMM driver and TM