Some improvements in messaging.

Signed-off-by: roliveros-ramos <ricardo.oliveros@gmail.com>