Fixing deprecated items