Upgraded some of the messages to show correct tags