fixups to the rebase

Created by  Graham Christensen  on March 18, 2021
MTZKFONQJNZATSZXPXCVRRIFMVPFUVPFXDKT4GE243TS5YHUOI6QC
Change contents