diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
index 9b8c2a9..ec10891 100644
--- a/lib/ipmi_channel.c
+++ b/lib/ipmi_channel.c
@@ -360,7 +360,7 @@ ipmi_get_user_access(struct ipmi_intf *intf, uint8_t channel, uint8_t userid)
 	int max_uid = 0;
 	int init = 1;
 
-	curr_uid = userid ? : 1;
+	curr_uid = userid ? userid : 1;
 
 	memset(&req1, 0, sizeof(req1));
 	req1.msg.netfn = IPMI_NETFN_APP;
diff --git a/lib/ipmi_sel.c b/lib/ipmi_sel.c
index 67e12e3..4aaab1d 100644
--- a/lib/ipmi_sel.c
+++ b/lib/ipmi_sel.c
@@ -2919,7 +2919,7 @@ ipmi_sel_show_entry(struct ipmi_intf * intf, int argc, char ** argv)
 
 		/* print SDR entry */
 		oldv = verbose;
-		verbose = verbose ? : 1;
+		verbose = verbose ? verbose : 1;
 		switch (sdr->type) {
 		case SDR_RECORD_TYPE_FULL_SENSOR:
 		case SDR_RECORD_TYPE_COMPACT_SENSOR:
diff --git a/src/ipmievd.c b/src/ipmievd.c
index 61b8069..fec5493 100644
--- a/src/ipmievd.c
+++ b/src/ipmievd.c
@@ -284,7 +284,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
 				eintf->prefix,
 				type,
 				sdr->record.full->id_string,
-				desc ? : "",
+				desc ? desc : "",
 				(evt->sel_type.standard_type.event_dir
 				 ? "Deasserted" : "Asserted"),
 				(trigger_reading==(int)trigger_reading) ? 0 : 2,
@@ -304,7 +304,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
 			 */
 			lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
 				eintf->prefix, type,
-				sdr->record.full->id_string, desc ? : "",
+				sdr->record.full->id_string, desc ? desc : "",
 				(evt->sel_type.standard_type.event_dir
 				 ? "Deasserted" : "Asserted"));
 			if (((evt->sel_type.standard_type.event_data[0] >> 6) & 3) == 1) {
@@ -317,7 +317,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
 			 */
 			lprintf(LOG_NOTICE, "%s%s sensor %s %s %s",
 				eintf->prefix, type,
-				sdr->record.full->id_string, desc ? : "",
+				sdr->record.full->id_string, desc ? desc : "",
 				(evt->sel_type.standard_type.event_dir
 				 ? "Deasserted" : "Asserted"));
 		}
@@ -326,7 +326,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
 	case SDR_RECORD_TYPE_COMPACT_SENSOR:
 		lprintf(LOG_NOTICE, "%s%s sensor %s - %s %s",
 			eintf->prefix, type,
-			sdr->record.compact->id_string, desc ? : "",
+			sdr->record.compact->id_string, desc ? desc : "",
 			(evt->sel_type.standard_type.event_dir
 			 ? "Deasserted" : "Asserted"));
 		break;
@@ -334,7 +334,7 @@ log_event(struct ipmi_event_intf * eintf, struct sel_event_record * evt)
 	default:
 		lprintf(LOG_NOTICE, "%s%s sensor - %s",
 			eintf->prefix, type,
-			evt->sel_type.standard_type.sensor_num, desc ? : "");
+			evt->sel_type.standard_type.sensor_num, desc ? desc : "");
 		break;
 	}