2.3.x: small changes to examples, do we merge these into 2.3.x?