Fixes for new log format
Regexp fix