Update some deprecated code