Fix batch manager
Clean left over for PWG2.6
Set correct permission