Index: code/pilotfile/csg_convert.cpp
===================================================================
--- code/pilotfile/csg_convert.cpp	(revision 9720)
+++ code/pilotfile/csg_convert.cpp	(working copy)
@@ -642,8 +642,7 @@
 
 	csg_import_missions(inferno);
 
-	cfread_string(temp, NAME_LENGTH, cfp);
-	csg->main_hall = temp;
+	csg->main_hall = cfread_ubyte(cfp);
 
 	csg_import_red_alert();
 

Index: code/pilotfile/csg_convert.cpp
===================================================================
--- code/pilotfile/csg_convert.cpp	(revision 9739)
+++ code/pilotfile/csg_convert.cpp	(working copy)
@@ -564,10 +564,10 @@
 	}
 
 	// loadout info
-	for (idx = 0; idx < 12; idx++) {
+	for (idx = 0; idx < MAX_WSS_SLOTS_CONV; idx++) {
 		csg->loadout.slot[idx].ship_index = cfread_int(cfp);
 
-		for (j = 0; j < 12; j++) {
+		for (j = 0; j < MAX_SHIP_WEAPONS_CONV; j++) {
 			csg->loadout.slot[idx].wep[j] = cfread_int(cfp);
 			csg->loadout.slot[idx].wep_count[j] = cfread_int(cfp);
 		}
Index: code/pilotfile/pilotfile_convert.h
===================================================================
--- code/pilotfile/pilotfile_convert.h	(revision 9739)
+++ code/pilotfile/pilotfile_convert.h	(working copy)
@@ -29,6 +29,8 @@
 #include "pilotfile/pilotfile.h"
 
 
+static const int MAX_WSS_SLOTS_CONV = 12;   // 3 wings * 4 slots
+static const int MAX_SHIP_WEAPONS_CONV = 7; // 3 primary + 4 secondary
 
 typedef struct index_list_t {
 	SCP_string name;
@@ -88,8 +90,8 @@
 
 typedef struct wss_unit_conv_t {
 	int ship_index;
-	int wep[12];
-	int wep_count[12];
+	int wep[MAX_SHIP_WEAPONS_CONV];
+	int wep_count[MAX_SHIP_WEAPONS_CONV];
 
 	wss_unit_conv_t() :
 		ship_index(-1)
@@ -101,7 +103,7 @@
 	SCP_string filename;
 	SCP_string last_modified;
 
-	wss_unit_conv_t slot[12];
+	wss_unit_conv_t slot[MAX_WSS_SLOTS_CONV];
 
 	SCP_vector<int> weapon_pool;
 	SCP_vector<int> ship_pool;

Index: code/pilotfile/csg_convert.cpp
===================================================================
--- code/pilotfile/csg_convert.cpp	(revision 9743)
+++ code/pilotfile/csg_convert.cpp	(working copy)
@@ -686,12 +686,6 @@
 	// tips
 	cfwrite_ubyte((ubyte)plr->tips, cfp);
 
-	// mainhall
-	cfwrite_string(const_cast<char*>(csg->main_hall.c_str()), cfp);
-
-	// cutscenes
-	cfwrite_int(csg->cutscenes, cfp);
-
 	endSection();
 }
 
Index: code/pilotfile/pilotfile_convert.h
===================================================================
--- code/pilotfile/pilotfile_convert.h	(revision 9743)
+++ code/pilotfile/pilotfile_convert.h	(working copy)
@@ -126,10 +126,9 @@
 
 	// not carried over, just for reference during conversion process
 	int version;
-	int is_multi;
 
-
 	// basic flags and settings
+	int is_multi;
 	int tips;
 	int rank;
 	int skill_level;
Index: code/pilotfile/plr_convert.cpp
===================================================================
--- code/pilotfile/plr_convert.cpp	(revision 9743)
+++ code/pilotfile/plr_convert.cpp	(working copy)
@@ -421,8 +421,8 @@
 		throw "Unsupported file version!";
 	}
 
-	// multi flag, don't need it
-	cfread_ubyte(cfp);
+	// multi flag
+	plr->is_multi = (int)cfread_ubyte(cfp);
 
 	// rank
 	plr->rank = cfread_int(cfp);
@@ -549,6 +549,9 @@
 	// special rank setting (to avoid having to read all stats on verify)
 	cfwrite_int(plr->rank, cfp);
 
+	// What game mode we were in last on this pilot
+	cfwrite_int(plr->is_multi, cfp);
+
 	endSection();
 }