Addressed code analysis issues