NOJIRA: Fix funny bugs in PCP