NOJIRA: Fixed path issue for Infusion.
NOJIRA: more fixes to paths.