- compatibility fixes