That's the bulk of the needed changes, a few more are still missing though to bump the deprecation level.