Minor fixes to coverity_scan addon