Fixes for stored file names