Fixed up a few of the neglected files where recent changes to the GENERATE and FITNESS api had broken them.