Add back 2 missing commits from previous PR

https://github.com/ooici/coi-services/pull/1067 is missing 2 commits.  These are them