diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake
index 69811bce..3e21b98a 100644
--- a/cmake/Findlibusb.cmake
+++ b/cmake/Findlibusb.cmake
@@ -10,10 +10,10 @@ find_path(LIBUSB_INCLUDE_DIR
 )
 
 if (libusb_USE_STATIC_LIBS AND NOT MSVC)
-    set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefox passed to find_library")
+    set (LIBUSB_LIB_PREFIX "lib" CACHE INTERNAL "libusb library name prefix passed to find_library")
     set (LIBUSB_LIB_SUFFIX ".a" CACHE INTERNAL "libusb library name suffix passed to find_library")
 else (libusb_USE_STATIC_LIBS AND NOT MSVC)
-    set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefox passed to find_library")
+    set (LIBUSB_LIB_PREFIX "" CACHE INTERNAL "libusb library name prefix passed to find_library")
     set (LIBUSB_LIB_SUFFIX "" CACHE INTERNAL "libusb library name suffix passed to find_library")
 endif (libusb_USE_STATIC_LIBS AND NOT MSVC)
 
diff --git a/heimdall-frontend/source/mainwindow.cpp b/heimdall-frontend/source/mainwindow.cpp
index e110d69f..f06fb4ee 100644
--- a/heimdall-frontend/source/mainwindow.cpp
+++ b/heimdall-frontend/source/mainwindow.cpp
@@ -131,7 +131,7 @@ bool MainWindow::ReadPit(QFile *file)
 	file->close();
 
 	bool success = currentPitData.Unpack(buffer);
-	delete buffer;
+	delete[] buffer;
 
 	if (!success)
 		currentPitData.Clear();
@@ -659,7 +659,7 @@ void MainWindow::SelectPartitionName(int index)
 
 		partitionFileGroup->setTitle(title);
 
-		if (!fileInfo.GetFilename().isEmpty())
+		if (pitEntry && !fileInfo.GetFilename().isEmpty())
 		{
 			QString partitionFilename = pitEntry->GetFlashFilename();
 			int lastPeriod = partitionFilename.lastIndexOf(QChar('.'));
diff --git a/heimdall/source/FlashAction.cpp b/heimdall/source/FlashAction.cpp
index 590e0b5e..d9203b06 100644
--- a/heimdall/source/FlashAction.cpp
+++ b/heimdall/source/FlashAction.cpp
@@ -185,7 +185,7 @@ static bool sendTotalTransferSize(BridgeManager *bridgeManager, const vector<Par
 
 	if (totalBytesResult != 0)
 	{
-		Interface::PrintError("Unexpected session total bytes response!\nExpected: 0\nReceived:%d\n", totalBytesResponse);
+		Interface::PrintError("Unexpected session total bytes response!\nExpected: 0\nReceived:%d\n", totalBytesResult);
 		return (false);
 	}