Fixed some minor issues in Parser