Fix optimisation IBC stuff.