Fix a few minute case and scope issues.