Should fix a couple of message checking problems.