Better synchronization on message store
Remove warnings