tweaks to make more examples work with the new pub/sub scheme