More fixes in the examples