OC Tweakings.

Don't stray too far off the path...