Updated for Coverity Scan Integratoin