Updates from vmm-akaros