Various minor fixes in examples