More fixes in examples