Compatibility fixes.