Continue to correct some coverity warnings + improve a little some codes...