Correction of several errors