Some fixes after code-analysis-tools