some more message fixes