Fixup filename and metadata