Resolved some scope issues