Fix more broken stuff.