Minor fixes for execution from within folder