Fix code analysis "issues"