Fix some more Coverity issues.

Done