Staying close to mainline and VM issues