Maintainence release. Fixes issues raised due to changes in Pinocchio