more lost commits
Fix a number of out of data directory references