fix code analysis issues;