A lot of Code Analysis warning resolved