Fixing parsing issues and reducing consume calls.