scope deprecations fixed