Fixes to the parser