More backwards compatibility issues.