diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp
index f9e12df32c..0c3153c9cf 100644
--- a/src/apps/soundrecorder/RecorderWindow.cpp
+++ b/src/apps/soundrecorder/RecorderWindow.cpp
@@ -167,6 +167,8 @@ RecorderWindow::~RecorderWindow()
 	//	Clean up currently recording file, if any.
 	fRecEntry.Remove();
 	fRecEntry.Unset();
+
+	delete fSavePanel;
 }
 
 
@@ -266,7 +268,7 @@ RecorderWindow::InitWindow()
 
 		BRect buttonRect;
 
-  		//	Button for rewinding
+		//	Button for rewinding
 		buttonRect = BRect(BPoint(0,0), kSkipButtonSize);
 		buttonRect.OffsetTo(background->Bounds().LeftBottom() - BPoint(-7, 25));
 		fRewindButton = new TransportButton(buttonRect, "Rewind",
diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp
index 4a4dee5de3..618abb8d99 100644
--- a/src/apps/text_search/GrepWindow.cpp
+++ b/src/apps/text_search/GrepWindow.cpp
@@ -511,10 +511,10 @@ GrepWindow::_CreateMenus()
 	fPreferencesMenu->AddSeparatorItem();
 	fPreferencesMenu->AddItem(fShowLinesMenuitem);
 
- 	fEncodingMenu->AddItem(fUTF8);
- 	fEncodingMenu->AddItem(fShiftJIS);
- 	fEncodingMenu->AddItem(fEUC);
- 	fEncodingMenu->AddItem(fJIS);
+	fEncodingMenu->AddItem(fUTF8);
+	fEncodingMenu->AddItem(fShiftJIS);
+	fEncodingMenu->AddItem(fEUC);
+	fEncodingMenu->AddItem(fJIS);
 
 //	fEncodingMenu->SetLabelFromMarked(true);
 		// Do we really want this ?
@@ -1557,9 +1557,11 @@ GrepWindow::_OnOpenPanel()
 	if (get_ref_for_path(fModel->fFilePanelPath.String(), &path) != B_OK)
 		return;
 
-	fFilePanel = new BFilePanel(B_OPEN_PANEL, new BMessenger(NULL, this),
-		&path, B_FILE_NODE|B_DIRECTORY_NODE|B_SYMLINK_NODE,
-		true, new BMessage(MSG_REFS_RECEIVED), NULL, true, true);
+	BMessenger messenger(this);
+	BMessage message(MSG_REFS_RECEIVED);
+	fFilePanel = new BFilePanel(B_OPEN_PANEL, &messenger, &path,
+		B_FILE_NODE | B_DIRECTORY_NODE | B_SYMLINK_NODE, true,
+		&message, NULL, true, true);
 
 	fFilePanel->Show();
 }
diff --git a/src/kits/tracker/InfoWindow.cpp b/src/kits/tracker/InfoWindow.cpp
index 84c987e82a..b70af25c6b 100644
--- a/src/kits/tracker/InfoWindow.cpp
+++ b/src/kits/tracker/InfoWindow.cpp
@@ -787,10 +787,10 @@ BInfoWindow::OpenFilePanel(const entry_ref *ref)
 	// for the sym link
 	if (fFilePanel == NULL) {
 		BMessenger runner(this);
-
+		BMessage message(kNewTargetSelected);
 		fFilePanel = new BFilePanel(B_OPEN_PANEL, &runner, ref,
 			B_FILE_NODE | B_SYMLINK_NODE | B_DIRECTORY_NODE,
-			false, new BMessage(kNewTargetSelected));
+			false, &message);
 
 		if (fFilePanel != NULL) {
 			fFilePanel->SetButtonLabel(B_DEFAULT_BUTTON,"Select");