Fix a few more coverity complaints.