Fixes parsing issues