Bug fixes, iteration migration.