Fixes for warn_only (experimental) feature