Added Coverity Fixes