Fixes a few missing changes when merging main branch into sites.stedwards