Structural fixes to IR, publishing modified