Update some deprecated references