diff --git a/projects/clr/hipamd/src/hip_db.cpp b/projects/clr/hipamd/src/hip_db.cpp
index 21fa677fe6..7565d70422 100644
--- a/projects/clr/hipamd/src/hip_db.cpp
+++ b/projects/clr/hipamd/src/hip_db.cpp
@@ -1,5 +1,5 @@
 
-#include "hcc/hc_am.hpp"
+#include <hc_am.hpp>
 
 
 
diff --git a/projects/clr/hipamd/src/hip_hcc.cpp b/projects/clr/hipamd/src/hip_hcc.cpp
index 39466aa834..8aaa7af02b 100644
--- a/projects/clr/hipamd/src/hip_hcc.cpp
+++ b/projects/clr/hipamd/src/hip_hcc.cpp
@@ -96,7 +96,7 @@ int HIP_SYNC_NULL_STREAM = 1;
 
 // HIP needs to change some behavior based on HCC_OPT_FLUSH :
 // TODO - set this to 1
-int HCC_OPT_FLUSH = 1;
+int HCC_OPT_FLUSH = 0;