Fix more places without proper language support.