Iteration fixes