update and fix deprecations