coverity fixes - v2 task