compatibility fixes
compatibility fixes