update/fix examples for 2.18