1bb30b7 NOJIRA: more fixes to paths.