diff --git a/src/add-ons/tracker/filetype/FileTypeWindow.cpp b/src/add-ons/tracker/filetype/FileTypeWindow.cpp
index 166ee50d93..4ca6d9757d 100644
--- a/src/add-ons/tracker/filetype/FileTypeWindow.cpp
+++ b/src/add-ons/tracker/filetype/FileTypeWindow.cpp
@@ -45,7 +45,7 @@ FileTypeWindow::~FileTypeWindow()
 {
 	if (fEntryList != 0) {
 		for (int32 i = 0 ; (i < fEntryList->CountItems()) ; i++) {
-			delete fEntryList->ItemAt(i);
+			delete static_cast<BEntry*>(fEntryList->ItemAt(i));
 		}
 		fEntryList->MakeEmpty();
 		delete fEntryList;
diff --git a/src/apps/terminal/TerminalWindow.cpp b/src/apps/terminal/TerminalWindow.cpp
index 1081f73c6d..d0425e5cea 100644
--- a/src/apps/terminal/TerminalWindow.cpp
+++ b/src/apps/terminal/TerminalWindow.cpp
@@ -231,6 +231,8 @@ TerminalWindow::InitWindow(int32 id, entry_ref * settingsRef)
 	fLogToFilePanel = 0;
 	fWriteSelectionPanel = 0;
 	fSaveAsSettingsFilePanel = 0;
+
+	return B_OK;
 }
 
 status_t