Coverity fixes, VPP-486