diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 9a6f013ae..c9bf4c1cc 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -172,7 +172,7 @@ IrrDriver::IrrDriver()
 #ifndef SERVER_ONLY
     for (unsigned i = 0; i < Q_LAST; i++)
     {
-         m_perf_query[i] = new GPUTimer(m_perf_query_phase[i]);
+        m_perf_query[i] = new GPUTimer(m_perf_query_phase[i]);
     }
 #endif
 }   // IrrDriver
@@ -191,7 +191,7 @@ IrrDriver::~IrrDriver()
 #ifndef SERVER_ONLY
     for (unsigned i = 0; i < Q_LAST; i++)
     {
-         delete m_perf_query[i];
+        delete m_perf_query[i];
     }
 #endif
     assert(m_device != NULL);
@@ -203,8 +203,12 @@ IrrDriver::~IrrDriver()
 // ----------------------------------------------------------------------------
 const char* IrrDriver::getGPUQueryPhaseName(unsigned q)
 {
+#ifndef SERVER_ONLY
     assert(q < Q_LAST);
     return m_perf_query_phase[q];
+#else
+    return "";
+#endif
 }   // getGPUQueryPhaseName
 
 // ----------------------------------------------------------------------------
diff --git a/src/main.cpp b/src/main.cpp
index 3e8f8fb5e..3bfc67b1d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -712,7 +712,7 @@ int handleCmdLinePreliminary()
         UserConfigParams::m_verbosity |= UserConfigParams::LOG_ALL;
     if(CommandLine::has("--online"))
         MainMenuScreen::m_enable_online=true;
-#ifndef ANDROID
+#if !(defined(SERVER_ONLY) || defined(ANDROID))
     if(CommandLine::has("--apitrace"))
     {
         SP::sp_apitrace = true;