Fixed bugs with iteration editing