Fixed some body scope issues.