Coverity fixes part 2

These are two remaining fixes from my pass over v3.0.4 rc2 coverity issues.