Fixed other parsing problems