V1.2: More files corrections