Fix up a number of modules so that they return the full set of results