Feature/fix deprecations