Fixing depracations