more fixes for deprecated methods