Subgenerator fixes and improvements