Regenerated with latest fixes