Addressing more issues from scan-build
1 file changed