Tweaks for MARS-VM