Fix more parser errors (found using error check workflow)