Fixing compat issues.