Fixes parsing errors