Attempting to fix data directory errors introduced after pull request.