Attempting to fix OG warnings.