Fixes for messages synchronization