Fixing more scope issues.