More fixes for the examples