Fixes for HTTP Enricher