Fix more broken stuff from repo transfer