Fixed some parsing issues.