Fix a few random issues that scanbuild found.

2020-12-17, Gary Kramlich