Adjust generators to recent changes