Fixed errorneous WITH_ORPL guards