bugfixes
following recent changes of the parser