fixup! Fix Coverity defects