Fixing parsing errors