diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 5ffcd339af..688398b44f 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -804,7 +804,7 @@ BContainerWindow::AddContextMenus()
 	AddDropContextMenus(fDropContextMenu);
 
 	fDragContextMenu = new BSlowContextMenu("DragContext");
-	// will get added and built dynamically in ShowContextMenu
+		// will get added and built dynamically in ShowContextMenu
 
 	fTrashContextMenu = new BPopUpMenu("TrashContext", false, false);
 	fTrashContextMenu->SetFont(be_plain_font);
@@ -2499,14 +2499,14 @@ BContainerWindow::ShowContextMenu(BPoint loc, const entry_ref *ref, BView *)
 			BPoint global(loc);
 			PoseView()->ConvertToScreen(&global);
 			PoseView()->CommitActivePose();
-			BRect mouse_rect(global.x, global.y, global.x, global.y);
-			mouse_rect.InsetBy(-5, -5);
+			BRect mouseRect(global.x, global.y, global.x, global.y);
+			mouseRect.InsetBy(-5, -5);
 	
 			EnableNamedMenuItem(fTrashContextMenu, kEmptyTrash,
 				static_cast<TTracker *>(be_app)->TrashFull());
 	
 			SetupNavigationMenu(ref, fTrashContextMenu);
-			fTrashContextMenu->Go(global, true, false, mouse_rect, true);
+			fTrashContextMenu->Go(global, true, false, mouseRect, true);
 		} else {
 		
 			bool showAsVolume = false;
@@ -2549,9 +2549,9 @@ BContainerWindow::ShowContextMenu(BPoint loc, const entry_ref *ref, BView *)
 					fDragContextMenu->SetTarget(BMessenger(this));
 					BPoseView *poseView = PoseView();
 					if (poseView) {
-						BMessenger tmpTarget(poseView);
+						BMessenger target(poseView);
 						fDragContextMenu->InitTrackingHook(
-							&BPoseView::MenuTrackingHook, &tmpTarget, fDragMessage);
+							&BPoseView::MenuTrackingHook, &target, fDragMessage);
 					}
 		
 					// this is now asynchronous so that we don't
diff --git a/src/kits/tracker/DesktopPoseView.cpp b/src/kits/tracker/DesktopPoseView.cpp
index 1997ad1f68..7aed835266 100644
--- a/src/kits/tracker/DesktopPoseView.cpp
+++ b/src/kits/tracker/DesktopPoseView.cpp
@@ -178,6 +178,7 @@ DesktopPoseView::AddPosesCompleted()
 	AddTrashPose();
 }
 
+
 bool
 DesktopPoseView::ShouldShowPose(const Model *model, const PoseInfo *poseInfo)
 {
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index ac55f29870..c722465451 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -764,9 +764,9 @@ BPoseView::SavePoseLocations(BRect *frameIfDesktop)
 			if (model->IsRoot() || isTrash) {
 				BDirectory dir;
 				if (FSGetDeskDir(&dir) == B_OK) {
-					const char *poseInfoAttr = (isTrash) ? kAttrTrashPoseInfo
+					const char *poseInfoAttr = isTrash ? kAttrTrashPoseInfo
 						: kAttrDisksPoseInfo;
-					const char *poseInfoAttrForeign = (isTrash) 
+					const char *poseInfoAttrForeign = isTrash 
 						? kAttrTrashPoseInfoForeign 
 						: kAttrDisksPoseInfoForeign;
 						if (dir.WriteAttr(poseInfoAttr, B_RAW_TYPE, 0,
@@ -2652,9 +2652,9 @@ BPoseView::ReadPoseInfo(Model *model, PoseInfo *poseInfo)
 	if (model->IsRoot() || isTrash) {
 		BDirectory dir;
 		if (FSGetDeskDir(&dir) == B_OK) {
-			const char *poseInfoAttr = (isTrash) ? kAttrTrashPoseInfo 
+			const char *poseInfoAttr = isTrash ? kAttrTrashPoseInfo 
 				: kAttrDisksPoseInfo;
-			const char *poseInfoAttrForeign = (isTrash) ? kAttrTrashPoseInfoForeign 
+			const char *poseInfoAttrForeign = isTrash ? kAttrTrashPoseInfoForeign 
 				: kAttrDisksPoseInfoForeign;
 			result = ReadAttr(&dir, poseInfoAttr, poseInfoAttrForeign,
 				B_RAW_TYPE, 0, poseInfo, sizeof(*poseInfo), &PoseInfo::EndianSwap);
diff --git a/src/system/libroot/os/find_directory.c b/src/system/libroot/os/find_directory.c
index 1d9a93b319..cb79bc83a3 100644
--- a/src/system/libroot/os/find_directory.c
+++ b/src/system/libroot/os/find_directory.c
@@ -202,7 +202,7 @@ find_directory(directory_which which, dev_t device, bool createIt,
 			// TODO: eventually put that into the file system API?
 			if (device == bootDevice || !strcmp(fsInfo.fsh_name, "bfs"))
 				template = "Trash"; // TODO: add suffix for current user
-			else if (!strcmp(fsInfo.fsh_name, "dos"))
+			else if (!strcmp(fsInfo.fsh_name, "fat"))
 				template = "RECYCLED/_BEOS_";
 			break;