made them work regardless of cwd (some changes slipped into prev automatic commit, sorry)