Made preparations for coverity scan