Fix more stuff in gencode