Tweaking the examples for demos