Fixes for tuple store iterator