Adding better controls over messages

Avoid some inconsistency with messages.