More scope implementation fixes