Fixes the deprecates