Changes to fix seeding