Fixes for the parser