Coverity2312 3

Fix recently introduced coverity issues.