Fix minor issues with iteration support.