Iterator fix and removal of unnecessary concurrency
More fixes