more coverity scan tweaks