fixes for Iterable inconsistency
merge with the latest