Fix some more Coverity issues.