Generic generator fixes