Fix latest coverity issues