Fixed some static analyzer issues.
Fixed static analyzer issue.