Fix Coverities (master)