fix up some deprecation