File structure corrections