Minor tweaks
Associative iterator tweak