Fix some more coverity complaints.