diff --git a/libnd4j/include/cnpy/cnpy.h b/libnd4j/include/cnpy/cnpy.h
index ea847c3e7..c84623599 100644
--- a/libnd4j/include/cnpy/cnpy.h
+++ b/libnd4j/include/cnpy/cnpy.h
@@ -69,7 +69,7 @@ namespace cnpy {
         }
     };
 
-    struct ND4J_EXPORT npz_t : public std::unordered_map<std::string, NpyArray> {
+    struct ND4J_EXPORT npz_t : public std::map<std::string, NpyArray> {
         void destruct() {
             npz_t::iterator it = this->begin();
             for(; it != this->end(); ++it) (*it).second.destruct();
diff --git a/libnd4j/include/ops/ops.h b/libnd4j/include/ops/ops.h
index ea52e9ba0..aca6fec6f 100644
--- a/libnd4j/include/ops/ops.h
+++ b/libnd4j/include/ops/ops.h
@@ -3963,9 +3963,6 @@ namespace simdOps {
 		}
 #endif
 
-#ifndef __clang__
-#pragma omp declare simd uniform(extraParamsRef)
-#endif
 		op_def static Y merge(X old, X opOutput, X *extraParamsRef) {
 			return update(old, opOutput, extraParamsRef);
 		}