Fixed messages that are not what they needed to be