Fixed problematic deprecations