More coverity changes to investigate failure reason