Fixes of issues found by Analyzer