Fix coverity issues

Merge request reports