diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index c8d1780862..5222e8ed46 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -209,7 +209,7 @@ BPoseView::BPoseView(Model *model, BRect bounds, uint32 viewMode, uint32 resizeM
 	fRefFilter(NULL),
 	fAutoScrollInc(20),
 	fAutoScrollState(kAutoScrollOff),
-	fWidgetTextOutline(false),
+	fWidgetTextOutline(true),
 	fSelectionPivotPose(NULL),
 	fRealPivotPose(NULL),
 	fKeyRunner(NULL),
diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp
index f38a505fba..b4730d3647 100644
--- a/src/preferences/backgrounds/BackgroundsView.cpp
+++ b/src/preferences/backgrounds/BackgroundsView.cpp
@@ -528,7 +528,7 @@ BackgroundsView::UpdateWithCurrent(void)
 	if (!fCurrentInfo) {
 		fImageMenu->FindItem(kMsgNoImage)->SetMarked(true);
 		fPlacementMenu->FindItem(kMsgManualPlacement)->SetMarked(true);
-		fIconLabelOutline->SetValue(B_CONTROL_OFF);
+		fIconLabelOutline->SetValue(B_CONTROL_ON);
 	} else {
 		fIconLabelOutline->SetValue(fCurrentInfo->fTextWidgetLabelOutline
 			? B_CONTROL_ON : B_CONTROL_OFF);
@@ -772,7 +772,6 @@ BackgroundsView::SaveSettings(void)
 
 		entry_ref ref;
 		BEntry entry;
-		BPath path;
 
 		fPanel->GetPanelDirectory(&ref);
 		entry.SetTo(&ref);
@@ -829,7 +828,7 @@ BackgroundsView::LoadSettings()
 		if (index == 0)
 			fWorkspaceMenu->AddSeparatorItem();
 
-		BPath path(string.String());
+		path.SetTo(string.String());
 		int32 i = AddPath(path);
 		BString s;
 		s << "Folder: " << path.Leaf();
@@ -859,6 +858,8 @@ BackgroundsView::UpdatePreview()
 		fPlacementMenu->SetEnabled(imageEnabled);
 	if (fIconLabelOutline->IsEnabled() ^ imageEnabled)
 		fIconLabelOutline->SetEnabled(imageEnabled);
+	if (!imageEnabled)
+		fIconLabelOutline->SetValue(B_CONTROL_ON);
 
 	bool textEnabled = (fPlacementMenu->FindItem(kMsgManualPlacement)->IsMarked())
 		&& imageEnabled;
diff --git a/src/preferences/backgrounds/ImageFilePanel.cpp b/src/preferences/backgrounds/ImageFilePanel.cpp
index 8861ee8dea..e1800e7637 100644
--- a/src/preferences/backgrounds/ImageFilePanel.cpp
+++ b/src/preferences/backgrounds/ImageFilePanel.cpp
@@ -121,7 +121,6 @@ ImageFilePanel::SelectionChanged()
 				fResolutionView->SetText(resolution.String());
 				delete bitmap;
 
-				BNode node(&ref);
 				BNodeInfo nodeInfo(&node);
 				char type[B_MIME_TYPE_LENGTH];
 				if (nodeInfo.GetType(type) == B_OK) {