Fixes for data directory location.