diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 9365cbbc44..26c5108516 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -273,7 +273,7 @@ ServerWindow::Show()
 	}
 	
 	if (fDirectWindowData != NULL)
-		_HandleDirectConnection(B_DIRECT_START|B_BUFFER_RESET);
+		HandleDirectConnection(B_DIRECT_START|B_BUFFER_RESET);
 }
 
 
@@ -288,7 +288,7 @@ ServerWindow::Hide()
 		return;
 
 	if (fDirectWindowData != NULL)
-		_HandleDirectConnection(B_DIRECT_STOP);
+		HandleDirectConnection(B_DIRECT_STOP);
 	
 	RootLayer* rootLayer = fWinBorder->GetRootLayer();
 	if (rootLayer && rootLayer->Lock()) {
@@ -2107,7 +2107,7 @@ ServerWindow::_EnableDirectWindowMode()
 
 
 void
-ServerWindow::_HandleDirectConnection(int bufferState, int driverState)
+ServerWindow::HandleDirectConnection(int bufferState, int driverState)
 {
 	if (fDirectWindowData == NULL)
 		return;
diff --git a/src/servers/app/ServerWindow.h b/src/servers/app/ServerWindow.h
index 244cded7ec..536bc7dba9 100644
--- a/src/servers/app/ServerWindow.h
+++ b/src/servers/app/ServerWindow.h
@@ -94,6 +94,8 @@ public:
 
 			// related thread/team_id(s).
 	inline	team_id				ClientTeam() const { return fClientTeam; }
+			
+			void				HandleDirectConnection(int bufferState = -1, int driverState = -1);
 
 			// server "private" - try not to use.
 	inline	int32				ClientToken() const { return fHandlerToken; }
@@ -118,7 +120,6 @@ private:
 	virtual void				_GetLooperName(char* name, size_t size);
 
 			status_t			_EnableDirectWindowMode();
-			void				_HandleDirectConnection(int bufferState = -1, int driverState = -1);
 			
 			// TODO: Move me elsewhere
 			status_t			PictureToRegion(ServerPicture *picture,
diff --git a/src/servers/app/WinBorder.cpp b/src/servers/app/WinBorder.cpp
index 745a02fa96..cb67a4122c 100644
--- a/src/servers/app/WinBorder.cpp
+++ b/src/servers/app/WinBorder.cpp
@@ -181,8 +181,7 @@ WinBorder::ResizeBy(float x, float y)
 {
 	STRACE(("WinBorder(%s)::ResizeBy()\n", Name()));
 
-	if (!_ResizeBy(x, y))
-		return;
+	_ResizeBy(x, y);
 }