Fixes some event parser implementations