Clean up Coverity warnings from last checkin

This small set of changes cleans up the Coverity warnings from the last large set of changes.