update for master, fix deprecations