Tweaks for Odilo changes.