Fixes to the examples