Minor parsing bugfixes