More path correction in .bat files
Merge branch 'devel'