Coupled iterator fixes