Thanks Code Analysis for bug fixing. Minor fixes.