tag fixes to please Coverity