Parsing bugfixes