Fixed use of deprecated items