diff --git a/driver/main.c b/driver/main.c
index d0b286c47..79b416bbe 100644
--- a/driver/main.c
+++ b/driver/main.c
@@ -71,7 +71,7 @@ const char HELP[] =
 #endif
 #include  <fcntl.h>
 
-#if HAVE_GETOPT_H
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
 
diff --git a/t-dll-api.cc b/t-dll-api.cc
index 4fcd623f8..8966563b3 100644
--- a/t-dll-api.cc
+++ b/t-dll-api.cc
@@ -1648,7 +1648,7 @@ extern "C" const char* ivl_nexus_name(ivl_nexus_t net)
       assert(net);
       if (net->name_ == 0) {
 	    char tmp[2 * sizeof(net) + 5];
-	    snprintf(tmp, sizeof tmp, "n%p", net);
+	    snprintf(tmp, sizeof tmp, "n%p", (void *)net);
 	    net->name_ = api_strings.add(tmp);
       }
       return net->name_;
diff --git a/t-dll.h b/t-dll.h
index f357ab384..d9ae83c74 100644
--- a/t-dll.h
+++ b/t-dll.h
@@ -625,7 +625,7 @@ struct ivl_parameter_s {
  */
 struct ivl_process_s {
       ivl_process_type_t type_ : 2;
-      int analog_flag          : 1;
+      unsigned int analog_flag : 1;
       ivl_scope_t scope_;
       ivl_statement_t stmt_;
       perm_string file;