Fixing deprecrated warnings on latest nightly