Fixed some wrong assumptions about file formats.