Continued working on compliance with MS Code Analysis rules