diff --git a/mux/src/command.h b/mux/src/command.h
index 4b7c47e..e2f7cc7 100644
--- a/mux/src/command.h
+++ b/mux/src/command.h
@@ -159,7 +159,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -170,7 +170,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -181,7 +181,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -192,7 +192,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -203,7 +203,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -214,7 +214,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
@@ -225,7 +225,7 @@ typedef struct
 {
     const char *cmdname;
     NAMETAB *switches;
-    int     perms;
+    unsigned perms;
     int     extra;
     int     callseq;
     int     hookmask;
diff --git a/mux/src/flags.h b/mux/src/flags.h
index 9fc11c6..58c1768 100644
--- a/mux/src/flags.h
+++ b/mux/src/flags.h
@@ -130,7 +130,7 @@
  */
 typedef struct flag_bit_entry
 {
-    int  flagvalue;         // Which bit in the object is the flag.
+    unsigned flagvalue;     // Which bit in the object is the flag.
     char flaglett;          // Flag letter for listing.
     int  flagflag;          // Ctrl flags for this flag.
     int  listperm;          // Who sees this flag when set.
diff --git a/mux/src/funmath.cpp b/mux/src/funmath.cpp
index 4b3ab4c..5aa1595 100644
--- a/mux/src/funmath.cpp
+++ b/mux/src/funmath.cpp
@@ -57,7 +57,7 @@ static const char *mux_FPStrings[] = { "+Inf", "-Inf", "Ind", "NaN", "0", "0", "
 #define IEEE_MAKE_TABLESIZE 5
 typedef union
 {
-    INT64  i64;
+    UINT64 i64;
     double d;
 } SpecialFloatUnion;
 
diff --git a/mux/src/htab.h b/mux/src/htab.h
index 84cda2a..612ca60 100644
--- a/mux/src/htab.h
+++ b/mux/src/htab.h
@@ -17,7 +17,7 @@ struct name_table
     const char *name;
     int minlen;
     int perm;
-    int flag;
+    unsigned flag;
 };
 
 /* BQUE - Command queue */
diff --git a/mux/src/powers.h b/mux/src/powers.h
index 2525410..bd99a7d 100644
--- a/mux/src/powers.h
+++ b/mux/src/powers.h
@@ -57,7 +57,7 @@
 
 typedef struct power_entry {
     const char *powername;  /* Name of the flag */
-    int powervalue; /* Which bit in the object is the flag */
+    unsigned powervalue; /* Which bit in the object is the flag */
     int powerpower; /* Ctrl flags for this power (recursive? :-) */
     int listperm;   /* Who sees this flag when set */
     bool (*handler)(dbref target, dbref player, POWER power, int fpowers, bool reset);    /* Handler for setting/clearing this flag */