Fixes to out of order messages, fixes to regex checking