fixes on messages