diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index c95d583997..96acc3bfe8 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -122,8 +122,8 @@ ServerWindow::ServerWindow(	const char *string,
 	// fClientWinPort is the port to which the app awaits messages from the server
 	fClientWinPort(winport),
 	fClientLooperPort(looperPort),
-	fHandlerToken(handlerID),
-	fClientViewsWithInvalidCoords(B_VIEW_RESIZED)
+	fClientViewsWithInvalidCoords(B_VIEW_RESIZED),
+	fHandlerToken(handlerID)
 {
 	STRACE(("ServerWindow(%s)::ServerWindow()\n",string? string: "NULL"));
 
diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
index 52700233f6..5c0ad0c64a 100644
--- a/src/servers/app/drawing/Painter/Painter.cpp
+++ b/src/servers/app/drawing/Painter/Painter.cpp
@@ -776,6 +776,7 @@ Painter::StrokeArc(BPoint center, float xRadius, float yRadius,
 						-angleRad, -spanRad);
 
 	agg::conv_curve<agg::bezier_arc> path(arc);
+	path.approximation_scale(2.0);
 
 	return _StrokePath(path);
 }