diff --git a/src/OCLStream.cpp b/src/OCLStream.cpp
index e962ea5..5a72b3c 100644
--- a/src/OCLStream.cpp
+++ b/src/OCLStream.cpp
@@ -103,10 +103,10 @@ OCLStream<T>::OCLStream(const unsigned int ARRAY_SIZE, const int device_index)
 template <class T>
 OCLStream<T>::~OCLStream()
 {
-  delete[] copy_kernel;
-  delete[] mul_kernel;
-  delete[] add_kernel;
-  delete[] triad_kernel;
+  delete copy_kernel;
+  delete mul_kernel;
+  delete add_kernel;
+  delete triad_kernel;
 }
 
 template <class T>
diff --git a/src/Stream.h b/src/Stream.h
index 527fe6a..e02c953 100644
--- a/src/Stream.h
+++ b/src/Stream.h
@@ -8,6 +8,9 @@ template <class T>
 class Stream
 {
   public:
+
+    virtual ~Stream(){}
+
     // Kernels
     // These must be blocking calls
     virtual void copy() = 0;
diff --git a/src/main.cpp b/src/main.cpp
index a0fbaf9..457ca9a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -154,7 +154,7 @@ void run()
 
   }
 
-  delete[] stream;
+  delete stream;
 
 }