Fix scope changes - WIP