compatibility fixes