Change a few comments / messages (minor)