diff --git a/common/src/tfe_http.cpp b/common/src/tfe_http.cpp
index cf5bf53..53196ef 100644
--- a/common/src/tfe_http.cpp
+++ b/common/src/tfe_http.cpp
@@ -40,7 +40,13 @@ static const char * __str_std_header_field_map[] =
 	[TFE_HTTP_CONT_TYPE] = "Content-Type",
 	[TFE_HTTP_CONT_DISPOSITION] = "Content-Disposition",
 	[TFE_HTTP_EXPIRES] = "Expires",
-	[TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding"
+	[TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding",
+	[TFE_HTTP_CACHE_CONTROL] = "Cache-Control",
+	[TFE_HTTP_IF_MATCH] = "If-Match",
+	[TFE_HTTP_IF_NONE_MATCH] = "If-None-Match",
+	[TFE_HTTP_IF_MODIFIED_SINCE] = "If-Modified-Since",
+	[TFE_HTTP_IF_UNMODIFIED_SINCE] = "If-Unmodified-Since",
+ 	[TFE_HTTP_LAST_MODIFIED] = "Last-Modified"
 };
 
 static const char * __str_std_method_map[1024] = {};
diff --git a/platform/src/proxy.cpp b/platform/src/proxy.cpp
index 96f0c68..68c0472 100644
--- a/platform/src/proxy.cpp
+++ b/platform/src/proxy.cpp
@@ -274,7 +274,7 @@ int main(int argc, char *argv[])
 	}
 
 
-	
+
 	future_promise_library_init();
 	tango_cache_global_init();
 	
@@ -348,7 +348,7 @@ unsigned int tfe_proxy_get_thread_count(void)
 struct event_base * tfe_proxy_get_evbase(unsigned int thread_id)
 {
 	assert(thread_id<g_default_proxy->nr_work_threads);
-	return g_default_proxy->work_threads[thread_id].evbase;
+	return g_default_proxy->work_threads[thread_id]->evbase;
 }
 
 
diff --git a/plugin/protocol/http/src/http_half.cpp b/plugin/protocol/http/src/http_half.cpp
index b5149b7..50d3117 100644
--- a/plugin/protocol/http/src/http_half.cpp
+++ b/plugin/protocol/http/src/http_half.cpp
@@ -41,7 +41,13 @@ static const char * __str_std_header_field_map[] =
 		[TFE_HTTP_CONT_TYPE] = "Content-Type",
 		[TFE_HTTP_CONT_DISPOSITION] = "Content-Disposition",
 		[TFE_HTTP_EXPIRES] = "Expires",
-		[TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding"
+		[TFE_HTTP_ACCEPT_ENCODING] = "Accept-Encoding",
+		[TFE_HTTP_CACHE_CONTROL] = "Cache-Control",
+		[TFE_HTTP_IF_MATCH] = "If-Match",
+		[TFE_HTTP_IF_NONE_MATCH] = "If-None-Match",
+		[TFE_HTTP_IF_MODIFIED_SINCE] = "If-Modified-Since",
+		[TFE_HTTP_IF_UNMODIFIED_SINCE] = "If-Unmodified-Since",
+		[TFE_HTTP_LAST_MODIFIED] = "Last-Modified"
 	};
 
 static enum tfe_http_std_field __str_header_field_to_std_field_id(const char * str_field, size_t len)