Bug squashing from OI integration.