Extend a few scopes and correct a typo