Remove scope subset and fix minor typos"