Fix some more coverity issues.