Fix latest coverity issues 1223224 1223225 1223226 1223227 1223228