Replace some ptr containers