Some iteration fixes