Tweaks to Mondo