more compatibility fixes