Handle pickle filenames better