Address code analysis issues