Corrections as per comments