Fix default_scope deprecation warnings