vmmapping improvements