Fixup and regenerated from scratch