jplindstrom Merge branch 'minor-fixups'