Fixing some issues with message coalescing. Still fails sometimes, though.