more path reference fixes around storage_dir