Fix code-analysis part