fix more iterator woes