More directory path tweaking