More fixes for new OI.