Fixed some parsing problems