Some corrections in comments and messages