Fixups after coverity