VIX_161: Fix to make data_dir work as expected.
Merge Macebobo's fixes for the customizable data directory.