Attempting to correct cross-class issues.