Make message more appropriate