Misc changes for #wd42 talk