A few more tweaks, to make it compliant with the current DOM produced by
VMM.