Bz/fix or silence coverity

This patch silence coverity scan results.