Clean up coverity warnings, VPP-486