Fixes to the subgenerators