A couple of more minor cleanups

Here are a few more minor cleanups found when running a static analyzer on the solution.