Fix more parsings