- fix coverity issues 966593-966596