Fixed static analysis warning
Fixed warnings