Corrections as per Taneb's recommendations