Corrected code analysis issues.