Fix some more message errors