Start fixing up createDataDir.