Fixup retrogen and oregen