Added some missing HandleScopes.