working-dir fixes