[4.0] Fix Coverity issues