Fix a few message errors