diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 600939b3cb..58d11022cf 100644
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -785,6 +785,8 @@ static void TestSocketServer()
 
         delete socket;
     }
+
+    delete server;
 }
 
 static void TestSocketClient()
@@ -2606,9 +2608,9 @@ int main(int argc, char **argv)
 #endif // TEST_MIME
 
 #ifdef TEST_SOCKETS
-    if ( 1 )
-        TestSocketServer();
     if ( 0 )
+        TestSocketServer();
+    if ( 1 )
     {
         TestSocketClient();
         TestProtocolFtp();
diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index d5f42bacd4..128f20e495 100644
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -282,7 +282,9 @@ void MyCanvas::OnDraw(wxDC& dc)
   dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
   dc.DrawEllipse(250, 250, 100, 50);
+#if wxUSE_SPLINES
   dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#endif // wxUSE_SPLINES
   dc.DrawLine(50, 230, 200, 230);
   dc.DrawText("This is a test string", 50, 230);