Fixed 2nd CR issues.