diff --git a/src/apps/switcher/ApplicationsView.cpp b/src/apps/switcher/ApplicationsView.cpp
index 1be9ca8c2f..6f5d82dda2 100644
--- a/src/apps/switcher/ApplicationsView.cpp
+++ b/src/apps/switcher/ApplicationsView.cpp
@@ -36,7 +36,7 @@ ApplicationsView::AttachedToWindow()
 
 	for (int32 i = 0; i < teamList.CountItems(); i++) {
 		app_info appInfo;
-		team_id team = (team_id)teamList.ItemAt(i);
+		team_id team = (uintptr_t)teamList.ItemAt(i);
 		if (be_roster->GetRunningAppInfo(team, &appInfo) == B_OK)
 			_AddTeam(appInfo);
 	}
diff --git a/src/apps/switcher/GroupListView.cpp b/src/apps/switcher/GroupListView.cpp
index 5aa26533c9..3ffb661171 100644
--- a/src/apps/switcher/GroupListView.cpp
+++ b/src/apps/switcher/GroupListView.cpp
@@ -105,19 +105,19 @@ GroupListView::SetModel(GroupListModel* model)
 		groupItem->SetVisible(false);
 		AddChild(groupItem);
 
-		void* group = model->GroupAt(groupIndex);
-		groupMap[(addr_t)group] = groupItem;
-		groupItem->AddItem(new RendererLayoutItem(this, groupIndex, group,
+		addr_t group = model->GroupAt(groupIndex);
+		groupMap[group] = groupItem;
+		groupItem->AddItem(new RendererLayoutItem(this, groupIndex, (void*)group,
 			fGroupRenderer));
 	}
 
 	int32 itemCount = model->CountItems();
 	for (int itemIndex = 0; itemIndex < itemCount; itemIndex++) {
-		void* group = model->GroupForItemAt(itemIndex);
-		if (group == NULL)
+		addr_t group = model->GroupForItemAt(itemIndex);
+		if (group == 0)
 			continue;
 
-		BGroupLayout* groupItem = groupMap[(addr_t)group];
+		BGroupLayout* groupItem = groupMap[group];
 		if (groupItem == NULL)
 			continue;
 
diff --git a/src/apps/switcher/GroupListView.h b/src/apps/switcher/GroupListView.h
index 831b55e07f..7e342d9183 100644
--- a/src/apps/switcher/GroupListView.h
+++ b/src/apps/switcher/GroupListView.h
@@ -12,17 +12,19 @@
 
 class GroupListModel {
 public:
+	virtual						~GroupListModel() {};
 	virtual	int32				CountItems() = 0;
 	virtual void*				ItemAt(int32 index) = 0;
 
 	virtual int32				CountGroups() = 0;
-	virtual void*				GroupAt(int32 index) = 0;
-	virtual void*				GroupForItemAt(int32 index) = 0;
+	virtual addr_t				GroupAt(int32 index) = 0;
+	virtual addr_t				GroupForItemAt(int32 index) = 0;
 };
 
 
 class ListItemRenderer {
 public:
+	virtual						~ListItemRenderer() {};
 	virtual void				SetTo(BView* owner, void* item) = 0;
 
 	virtual BSize				MinSize() = 0;
diff --git a/src/apps/switcher/WindowsView.cpp b/src/apps/switcher/WindowsView.cpp
index 2ecc499ca4..25c778619e 100644
--- a/src/apps/switcher/WindowsView.cpp
+++ b/src/apps/switcher/WindowsView.cpp
@@ -96,15 +96,15 @@ public:
 		return fWorkspaceCount;
 	}
 
-	virtual void* GroupAt(int32 index)
+	virtual addr_t GroupAt(int32 index)
 	{
-		return (void*)(_NthSetBit(index, fWorkspaces) + 1);
+		return _NthSetBit(index, fWorkspaces) + 1;
 	}
 
-	virtual void* GroupForItemAt(int32 index)
+	virtual addr_t GroupForItemAt(int32 index)
 	{
 		client_window_info* info = fWindows.ItemAt(index);
-		return (void*)(_NthSetBit(0, info->workspaces) + 1);
+		return _NthSetBit(0, info->workspaces) + 1;
 	}
 
 private:
@@ -116,7 +116,7 @@ private:
 			&& (info->show_hide_level <= 0 || info->is_mini);
 	}
 
-	int32 _NthSetBit(int32 index, uint32 mask)
+	uint32 _NthSetBit(int32 index, uint32 mask)
 	{
 		for (uint32 i = 0; i < 32; i++) {
 			if ((mask & (1UL << i)) != 0) {
@@ -221,7 +221,7 @@ class WorkspaceRenderer : public StringItemRenderer {
 public:
 	virtual void SetTo(BView* owner, void* item)
 	{
-		fWorkspace = (uint32)item;
+		fWorkspace = (uintptr_t)item;
 
 		if ((uint32)current_workspace() == fWorkspace - 1)
 			SetText(owner, "Current workspace");