Various bugfixes in parsers