diff --git a/libs/main/containers/pimap.h b/libs/main/containers/pimap.h
index 7740c638..4c10a2bb 100644
--- a/libs/main/containers/pimap.h
+++ b/libs/main/containers/pimap.h
@@ -369,7 +369,7 @@ inline std::ostream & operator <<(std::ostream & s, const PIMap<Key, Type> & v)
 		if (!first)
 			s << ", ";
 		first = false;
-		s << i->first << ": " << i->second;
+		s << i.key() << ": " << i.value();
 	}
 	s << "}";
 	return s;
diff --git a/libs/main/containers/piset.h b/libs/main/containers/piset.h
index 50603403..ddf3553e 100644
--- a/libs/main/containers/piset.h
+++ b/libs/main/containers/piset.h
@@ -87,14 +87,14 @@ public:
 	//! Unite set with "v"
 	PISet<T> & unite(const PISet<T> & v) {
 		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
-			_CSet::insert(i->first, 0);
+			_CSet::insert(i.key(), 0);
 		return *this;
 	}
 
 	//! Subtract set with "v"
 	PISet<T> & subtract(const PISet<T> & v) {
 		for (typename PIMap<T, uchar>::const_iterator i = v.begin(); i != v.end(); ++i)
-			_CSet::remove(i->first);
+			_CSet::remove(i.key());
 		return *this;
 	}
 
@@ -121,10 +121,10 @@ public:
 	PISet<T> & operator &=(const PISet<T> & v) {return intersect(v);}
 
 	//! Returns content of set as PIVector
-	PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;}
+	PIVector<T> toVector() const {PIVector<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << i.key(); return ret;}
 
 	//! Returns content of set as PIDeque
-	PIDeque<T> toDeque() const {PIDeque<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << (*i).first; return ret;}
+	PIDeque<T> toDeque() const {PIDeque<T> ret; for (typename _CSet::const_iterator i = _CSet::begin(); i != _CSet::end(); ++i) ret << i.key(); return ret;}
 
 };
 
@@ -152,7 +152,7 @@ inline PICout operator <<(PICout s, const PISet<Type> & v) {
 		if (!first)
 			s << ", ";
 		first = false;
-		s << i->first;
+		s << i.key();
 	}
 	s << "}";
 	s.restoreControl();