Made changes based on Code Analysis run.