fix some more deprecated code