Fixes for timewarp and bad event line matching in the regexp