More broken subgenerator fixes