More iteration fixes