Fixed code issues found with analysis tool.