Iterate functionality fixes related to callback misuse