diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index f250e2ac88..44d8783c91 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -80,7 +80,7 @@ port_id gAppServerPort;
 AppServer *app_server=NULL;
 
 //! Default background color for workspaces
-RGBColor workspace_default_color(51,102,160);
+//RGBColor workspace_default_color(51,102,160);
 
 //! System-wide GUI color object
 ColorSet gui_colorset;
diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index e047b3d146..7cadf212d3 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -121,8 +121,6 @@ ServerApp::ServerApp(port_id sendport, port_id rcvport, port_id clientLooperPort
 		fAppCursor->SetOwningTeam(fClientTeamID);
 	}
 
-//	fLockSem = create_sem(1, "ServerApp sem");
-
 	Run();
 
 	STRACE(("ServerApp %s:\n", fSignature.String()));
@@ -240,7 +238,7 @@ ServerApp::PostMessage(int32 code)
 /*!
 	\brief Send a message to the ServerApp's BApplication
 	\param msg The message to send
-*/
+*//*
 void
 ServerApp::SendMessageToClient(const BMessage *msg) const
 {
@@ -254,7 +252,7 @@ ServerApp::SendMessageToClient(const BMessage *msg) const
 
 	delete [] buffer;
 }
-
+*/
 /*!
 	\brief Sets the ServerApp's active status
 	\param value The new status of the ServerApp.
@@ -430,7 +428,7 @@ ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			for(int32 i=0; i<fSWindowList->CountItems(); i++)
 			{
 				win=(ServerWindow*)fSWindowList->ItemAt(i);
-				win->fWinBorder->UpdateColors();
+				win->GetWinBorder->UpdateColors();
 				win->SendMessageToClient(AS_UPDATE_COLORS, msg);
 			}
 */			break;
@@ -447,7 +445,7 @@ ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			for(int32 i=0; i<fSWindowList->CountItems(); i++)
 			{
 				win=(ServerWindow*)fSWindowList->ItemAt(i);
-				win->fWinBorder->UpdateFont();
+				win->GetWinBorder->UpdateFont();
 				win->SendMessageToClient(AS_UPDATE_FONTS, msg);
 			}
 */			break;
@@ -571,7 +569,7 @@ ServerApp::DispatchMessage(int32 code, LinkMsgReader &msg)
 			{
 				win = (ServerWindow*)fSWindowList->ItemAt(i);
 				win->Lock();
-				win->fWinBorder->UpdateDecorator();
+				const_cast<WinBorder *>(win->GetWinBorder())->UpdateDecorator();
 				win->Unlock();
 			}
 			break;
diff --git a/src/servers/app/ServerApp.h b/src/servers/app/ServerApp.h
index dc2e90b067..3356661fb3 100644
--- a/src/servers/app/ServerApp.h
+++ b/src/servers/app/ServerApp.h
@@ -100,7 +100,8 @@ private:
 	// port we receive messages from our BApplication
 	port_id	fMessagePort;
 			// TODO: find out why there is both the app port and the looper port. Do 
-			// we really need both?
+			// we really need both? Actually, we aren't using any of these ports,
+			// as BAppServerLink/BPortlink's messages always contain the reply port
 	// To send a message to the client, write a BMessage to this port
 	port_id	fClientLooperPort;
 	
@@ -121,6 +122,7 @@ private:
 		  
 	ServerCursor *fAppCursor;
 	
+	// TODO: Not used.
 	sem_id fLockSem;
 	
 	bool fCursorHidden;
diff --git a/src/servers/app/ServerWindow.h b/src/servers/app/ServerWindow.h
index b3c942e083..bea7d2dba1 100644
--- a/src/servers/app/ServerWindow.h
+++ b/src/servers/app/ServerWindow.h
@@ -131,9 +131,7 @@ private:
 										  int32 xOffset, int32 yOffset) const;
 
 protected:	
-	friend class ServerApp;
 	friend class WinBorder;
-	friend class Screen; 
 	friend class Layer;
 	
 			char				fName[50];