Addressed the code analysis warnings.