Assorted updates

@nealstewart