Fix in comments and messages