Further tweaks to support omni.