treewide: forward compatibility changes