Add some future version compatibility fixes.