More compatibility fixes