West coverity

rebased to maint.