--- vegastrike-src-0.5.1.r1/src/cmd/unit_collide.h.gcc7	2012-03-19 08:20:14.000000000 +0000
+++ vegastrike-src-0.5.1.r1/src/cmd/unit_collide.h	2017-02-17 01:51:14.619286806 +0000
@@ -94,9 +94,9 @@
     {
         if ( !hugeobjects.empty() )
             hugeobjects.clear();
-        if ( this->active_huge.size() )
+        if ( this->active_huge->size() )
             ha.clear();
-        if ( this->accum_huge.size() )
+        if ( this->accum_huge->size() )
             hb.clear();
         acc_huge.clear();
         act_huge.clear();
--- vegastrike-src-0.5.1.r1/src/gui/text_area.cpp.gcc7	2010-02-25 14:26:53.000000000 +0000
+++ vegastrike-src-0.5.1.r1/src/gui/text_area.cpp	2017-02-17 01:51:14.620286807 +0000
@@ -316,7 +316,7 @@
 {
     TextAreaItem *search;
     search = ItemList->FindCount( cur_selected, 0 );
-    if (search == 0) return '\0';
+    if (search == 0) return NULL;
     if (type == 1) return search->name;
 
     else return search->description;
--- vegastrike-src-0.5.1.r1/setup/src/include/central.cpp.gcc7	2004-10-25 03:27:13.000000000 +0100
+++ vegastrike-src-0.5.1.r1/setup/src/include/central.cpp	2017-02-17 01:51:14.620286807 +0000
@@ -65,7 +65,7 @@
 		if (CUR->name == NULL) { continue; }
 		if (strcmp(CUR->name, group) == 0) { return CUR->setting; }
 	} while ((CUR = CUR->next) > 0);
-	return '\0';
+	return NULL;
 }
 
 struct catagory *GetCatStruct(char *name) {
--- vegastrike-src-0.5.1.r1/launcher/general.cpp.gcc7	2004-04-15 11:53:56.000000000 +0100
+++ vegastrike-src-0.5.1.r1/launcher/general.cpp	2017-02-17 01:51:14.621286808 +0000
@@ -316,7 +316,7 @@
 
 // Some handy wrappers for glib that help error handling which prevent segfaults
 char *GetString(GString *line) {
-	if (line == 0) { return '\0'; }
+	if (line == 0) { return NULL; }
 	return line->str;
 }
 
@@ -344,7 +344,7 @@
 
 #ifdef __cplusplus
 char *GetString(char *line) {
-        if (line == 0) { return '\0'; }
+        if (line == 0) { return NULL; }
         return line;
 }
 
--- vegastrike-src-0.5.1.r1/mission/include/general.cpp.gcc7	2017-02-17 01:53:51.938460806 +0000
+++ vegastrike-src-0.5.1.r1/mission/include/general.cpp	2017-02-17 01:54:15.926487337 +0000
@@ -324,7 +324,7 @@
 
 // Some handy wrappers for glib that help error handling which prevent segfaults
 char *GetString(GString *line) {
-	if (line == 0) { return '\0'; }
+	if (line == 0) { return NULL; }
 	return line->str;
 }
 
@@ -352,7 +352,7 @@
 
 #ifdef __cplusplus
 char *GetString(char *line) {
-        if (line == 0) { return '\0'; }
+        if (line == 0) { return NULL; }
         return line;
 }