Corrections as per convention #2