compatibility fixes for fda70440f4