Coverity2312 3

Fix recently introuduced coverity issues.