Fixed more compatibility issues.