Fix more broken things in the autogeneration script