Could you wrap these additions around 80 chars please ? :smiley: If you do, please update the other similar lines as well (e.g. 469)