various messsage fixes