Fix a few more things to get everything working again
draft
2021-04-07, Gary Kramlich