fixed some more deprecations. 20 to go