Fix orc predicate

Only the last 3 commits need to be reviewed