Fix minor coverity issues (phase 2)