Tweaks to support 32- and 64-bit VMs better