diff --git a/Makefile.inc b/Makefile.inc
index 81ae14dd..66336934 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -36,12 +36,12 @@ endif
 
 # default CFLAGS, LDFLAGS
 #
-CFLAGS = 
+CFLAGS =
 LDFLAGS =
 DYFLAGS =
 
 # Adding the TS_CLASS flag enables not being scheduled RR
-CFLAGS += -DTS_CLASS
+#CFLAGS += -DTS_CLASS
 
 # build CFLAGS, LDFLAGS
 #
@@ -57,7 +57,7 @@ ifeq (${OPENAIS_BUILD}, DEBUG)
 	CFLAGS += -O0 -g -Wall -DDEBUG
 	LDFLAGS += -g
 	ifeq (${OPENAIS_COMPAT}, SOLARIS)
-		CFLAGS += -Werror
+		CFLAGS += -Werror -DTS_CLASS
 	endif
 endif
 ifeq (${OPENAIS_BUILD}, COVERAGE)
diff --git a/exec/ipc.c b/exec/ipc.c
index 48c0f50d..fca15861 100644
--- a/exec/ipc.c
+++ b/exec/ipc.c
@@ -753,11 +753,11 @@ static void libais_deliver (struct conn_info *conn_info)
 		msg_recv.msg_controllen = 0;
 	} else {
 #ifdef OPENAIS_LINUX
-		uid_t euid = -1;
-		gid_t egid = -1;
 		msg_recv.msg_control = (void *)cmsg_cred;
 		msg_recv.msg_controllen = sizeof (cmsg_cred);
 #else
+		uid_t euid = -1;
+		gid_t egid = -1;
 		if (getpeereid(conn_info->fd, &euid, &egid) != -1 &&
 		    (euid == 0 || egid == g_gid_valid)) {
 			conn_info->authenticated = 1;