Fixes for new parser