am b2d70d5b: Fix various message issues

* commit 'b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b':
  Fix various message issues