Bug fixes for __iter__