diff --git a/src/PluginDefinition.cpp b/src/PluginDefinition.cpp
index f43e069..d3e92c6 100644
--- a/src/PluginDefinition.cpp
+++ b/src/PluginDefinition.cpp
@@ -130,7 +130,7 @@ DWORD WINAPI ThreadProc(LPVOID lpParameter){
 			delete result;
 		}
 
-		delete pBuffer;
+		delete[] pBuffer;
 
 	}
 	else{
@@ -151,7 +151,7 @@ DWORD WINAPI ThreadProc(LPVOID lpParameter){
 			delete result;
 		}
 
-		delete pBuffer;
+		delete[] pBuffer;
 	}
 	return 0;
 }
diff --git a/src/URLCtrl.cpp b/src/URLCtrl.cpp
index da70800..45475ad 100644
--- a/src/URLCtrl.cpp
+++ b/src/URLCtrl.cpp
@@ -163,7 +163,7 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 
 		    // Draw the text!
             TCHAR szWinText[_MAX_PATH];
-            ::GetWindowText(hwnd, szWinText, sizeof szWinText);
+            ::GetWindowText(hwnd, szWinText, sizeof szWinText / sizeof TCHAR);
             ::DrawText(hdc, szWinText, -1, &rect, dwDTStyle);
     		
             ::SelectObject(hdc, hOld);
@@ -211,7 +211,7 @@ LRESULT URLCtrl::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 			    else
 			    {
                     TCHAR szWinText[_MAX_PATH];
-                    ::GetWindowText(hwnd, szWinText, sizeof szWinText);
+                    ::GetWindowText(hwnd, szWinText, sizeof szWinText / sizeof TCHAR);
                     ::ShellExecute(NULL, _T("open"), szWinText, NULL, NULL, SW_SHOWNORMAL);
 			    }
 		    }