Bugfixes for iterators of zero sized containers