#21 repair examples to fit changed interfaces