Addressed issue that are found by the code analysis tool.