Adjust examples to work with new versions.