Fix remaining errors and warnings

da50576129Nathan Sobo committed on 7/25/2021, 1:56:53 PMparent9edc8b9
7 files changedLine totals unavailable