Cleaned more iterator related problems