diff --git a/containers_cpp/include/embb/containers/internal/blocking_push_and_pop_container.h b/containers_cpp/include/embb/containers/internal/blocking_push_and_pop_container.h
index 2437877..a5a2887 100755
--- a/containers_cpp/include/embb/containers/internal/blocking_push_and_pop_container.h
+++ b/containers_cpp/include/embb/containers/internal/blocking_push_and_pop_container.h
@@ -67,6 +67,9 @@ class BlockingPushAndPopContainer {
 
   SpecializedPop(element);
   }
+
+ public:
+  virtual ~BlockingPushAndPopContainer() {}
 };
 
 }  // namespace containers
diff --git a/containers_cpp/test/map_test-inl.h b/containers_cpp/test/map_test-inl.h
index 1ce5d64..99dae41 100755
--- a/containers_cpp/test/map_test-inl.h
+++ b/containers_cpp/test/map_test-inl.h
@@ -78,7 +78,8 @@ void MapTest<T>::MapTest1_Post() {
   for (unsigned int i = 0; i < map_elements; i++) {
     PT_ASSERT(map_contain_vector[i] == map.Contains(static_cast<int>(i)));
     if (map_contain_vector[i])
-      PT_ASSERT((map[i] == i * 2));
+      PT_ASSERT(map[static_cast<int>(i)] ==
+        static_cast<const int>(i * 2));
   }
 }
 
@@ -89,7 +90,7 @@ void MapTest<T>::MapTest1_ThreadMethod() {
 
   PT_ASSERT((EMBB_SUCCESS == return_val));
 
-  srand(time(NULL));
+  srand(static_cast<unsigned int>(time(NULL)));
 
   std::vector<int>& my_values = thread_local_vectors_value[thread_index];
   std::vector<int>& my_keys = thread_local_vectors_key[thread_index];
diff --git a/containers_cpp/test/set_test-inl.h b/containers_cpp/test/set_test-inl.h
index d99896e..264298f 100755
--- a/containers_cpp/test/set_test-inl.h
+++ b/containers_cpp/test/set_test-inl.h
@@ -89,7 +89,7 @@ void SetTest<T>::SetTest1_ThreadMethod() {
 
   PT_ASSERT(EMBB_SUCCESS == return_val);
 
-  srand(time(NULL));
+  srand(static_cast<unsigned int>(time(NULL)));
 
   std::vector<int>& my_elements = thread_local_vectors[thread_index];