Resolved coverity issues