Cleanup scope issues.