Fix compatibility issues.