diff --git a/client/snapClient.cpp b/client/snapClient.cpp
index 98e7803b..c62aca11 100644
--- a/client/snapClient.cpp
+++ b/client/snapClient.cpp
@@ -67,7 +67,7 @@ PcmDevice getPcmDevice(const std::string& soundcard)
 int main (int argc, char **argv)
 {
 #ifdef MACOS
-#pragma message "Warning: the Mac OS support is experimental and might not be maintained"
+#pragma message "Warning: the macOS support is experimental and might not be maintained"
 #endif
 	try
 	{
diff --git a/server/publishAvahi.cpp b/server/publishAvahi.cpp
index 675cdbb2..64e272a4 100644
--- a/server/publishAvahi.cpp
+++ b/server/publishAvahi.cpp
@@ -72,13 +72,13 @@ PublishAvahi::~PublishAvahi()
 	active_ = false;
 	pollThread_.join();
 
-    if (client_)
-        avahi_client_free(client_);
+	if (client_)
+		avahi_client_free(client_);
 
-    if (simple_poll)
-        avahi_simple_poll_free(simple_poll);
+	if (simple_poll)
+		avahi_simple_poll_free(simple_poll);
 
-    avahi_free(name);
+	avahi_free(name);
 }
 
 
diff --git a/server/snapServer.cpp b/server/snapServer.cpp
index 68807cab..c35cc36f 100644
--- a/server/snapServer.cpp
+++ b/server/snapServer.cpp
@@ -45,6 +45,9 @@ using namespace popl;
 
 int main(int argc, char* argv[])
 {
+#ifdef MACOS
+#pragma message "Warning: the macOS support is experimental and might not be maintained"
+#endif
 	try
 	{
 		StreamServerSettings settings;
@@ -181,7 +184,3 @@ int main(int argc, char* argv[])
 	return 0;
 }
 
-
-
-
-