Some improvements to examples