Correction adapted to recent Orchard accepted pull request + Compilation framework 4.5