diff --git a/ede-bell-conf/ede-bell-conf.cpp b/ede-bell-conf/ede-bell-conf.cpp
index 8b865b7..8148a1f 100644
--- a/ede-bell-conf/ede-bell-conf.cpp
+++ b/ede-bell-conf/ede-bell-conf.cpp
@@ -48,7 +48,7 @@ static unsigned int dur_val;
 static bool block_xsettings_cb = false;
 
 #define CHECK_SETTING(n, setting, action) (strcmp(setting->name, n) == 0) && \
-		(action == XSETTINGS_ACTION_NEW) || (action == XSETTINGS_ACTION_CHANGED)
+		((action == XSETTINGS_ACTION_NEW) || (action == XSETTINGS_ACTION_CHANGED))
 
 #define KEY_VOLUME   "Bell/Volume"
 #define KEY_PITCH    "Bell/Pitch"
diff --git a/ede-calc/SciCalc.cpp b/ede-calc/SciCalc.cpp
index 463f148..a00ce0a 100644
--- a/ede-calc/SciCalc.cpp
+++ b/ede-calc/SciCalc.cpp
@@ -844,13 +844,15 @@ double sign;
 	if (ready) init_value(top);
 
 	if (numb == -1.0) 
-	if (dot) /* check whether we already have a dot */
-		return;
-	else 
 	{
-		dot = 1;
-		set_display(value[top],DOT);
-		return;
+		if (dot) /* check whether we already have a dot */
+			return;
+		else 
+		{
+			dot = 1;
+			set_display(value[top],DOT);
+			return;
+		}
 	}
 
 	if (emode) 
diff --git a/ede-calc/SciCalc.fl b/ede-calc/SciCalc.fl
index de209af..e6493ba 100644
--- a/ede-calc/SciCalc.fl
+++ b/ede-calc/SciCalc.fl
@@ -510,13 +510,15 @@ double sign;
 	if (ready) init_value(top);
 
 	if (numb == -1.0) 
-	if (dot) /* check whether we already have a dot */
-		return;
-	else 
 	{
-		dot = 1;
-		set_display(value[top],DOT);
-		return;
+		if (dot) /* check whether we already have a dot */
+			return;
+		else 
+		{
+			dot = 1;
+			set_display(value[top],DOT);
+			return;
+		}
 	}
 
 	if (emode) 
diff --git a/ede-keyboard-conf/ede-keyboard-conf.cpp b/ede-keyboard-conf/ede-keyboard-conf.cpp
index 0b7879c..0b80bda 100644
--- a/ede-keyboard-conf/ede-keyboard-conf.cpp
+++ b/ede-keyboard-conf/ede-keyboard-conf.cpp
@@ -121,7 +121,7 @@ static XkbRF_RulesPtr fetch_all_layouts(const String &current) {
 		for(int j = 0; x11_rules[j]; j++) {
 			snprintf(buf, sizeof(buf), "%s%s", x11_dirs[i], x11_rules[j]);
 
-			xkb_rules = XkbRF_Load(buf, "", True, True);
+			xkb_rules = XkbRF_Load(buf, (char*)"", True, True);
 			if(xkb_rules) 
 				goto done;
 		}
diff --git a/ede-screensaver-conf/XScreenSaver.cpp b/ede-screensaver-conf/XScreenSaver.cpp
index 09fec49..7fee142 100644
--- a/ede-screensaver-conf/XScreenSaver.cpp
+++ b/ede-screensaver-conf/XScreenSaver.cpp
@@ -333,8 +333,8 @@ static SaverPrefs *guess_config(void) {
 			break;
 
 		/* skip '.' and '..' */
-		if(entry->d_name[0] == '.' && 
-			(entry->d_name[1] == '\0' || entry->d_name[1] == '.' && entry->d_name[2] == '\0'))
+		if((entry->d_name[0] == '.' && entry->d_name[1] == '\0') || 
+			(entry->d_name[1] == '.' && entry->d_name[2] == '\0'))
 		{
 			continue;
 		}