Fix up data directory usage