More improvements to examples