fixes for updated file-storage