Mostly generator-related changes