Fix a few more scope issues.