Fix more message errors.