NOJIRA minor updates