Scope fixes & conflict correction.