Patched some OCD problems.

A wild OCD appears. So I had to patch that.