Address COVERITY warnings