Misc changes to ensure possibility to run tools with different VOs in parralel