Coupling fixes

Some last minute fixes for iterative coupling. Sorry for the delay. Can this still go into release before it is tagged?