Add compatibility fixes for 3.13->3.14. 3.14 not yet supported