tweak messages for #138