Client iteration fix and startup fix.