Fix for rtio removal and some deprecations