Fixed some issues with the parser