Support both versions of warnings