Static Analysis issues fixed

No match.