series of deprecation fixes to put in own PR