Also fixing some deprecated code (cherry picked from commit 2535ea92ebc97bad9f30e9e48493629df6db28a3)