Other modifications in the examples