Several files corrections