More compatibility fixes.