Corrections as proposed by Skinkie