More fixes to parsing engine

Should be fixed now