Fix some other scan coverity reports
Merge pull request #50 from serval2412/master

Fix some other scan coverity reports