Coverity annotation fixes