diff --git a/common/main/fuelcen.h b/common/main/fuelcen.h
index f16df2bf5..6773e8480 100644
--- a/common/main/fuelcen.h
+++ b/common/main/fuelcen.h
@@ -73,7 +73,7 @@ objptridx_t create_morph_robot(vsegptridx_t segp, const vms_vector &object_pos,
 
 // Returns the amount of fuel/shields this segment can give up.
 // Can be from 0 to 100.
-fix fuelcen_give_fuel(vsegptr_t segp, fix MaxAmountCanTake );
+fix fuelcen_give_fuel(vcsegptr_t segp, fix MaxAmountCanTake);
 
 // Call once per frame.
 void fuelcen_update_all();
@@ -84,7 +84,7 @@ void fuelcen_update_all();
 #if defined(DXX_BUILD_DESCENT_I)
 #define MAX_NUM_FUELCENS	50
 #elif defined(DXX_BUILD_DESCENT_II)
-fix repaircen_give_shields(vsegptr_t segp, fix MaxAmountCanTake );
+fix repaircen_give_shields(vcsegptr_t segp, fix MaxAmountCanTake);
 #define MAX_NUM_FUELCENS    70
 #endif
 
diff --git a/similar/main/fuelcen.cpp b/similar/main/fuelcen.cpp
index 28cc541d2..25832bd55 100644
--- a/similar/main/fuelcen.cpp
+++ b/similar/main/fuelcen.cpp
@@ -77,7 +77,7 @@ array<matcen_info, MAX_ROBOT_CENTERS> RobotCenters;
 array<FuelCenter, MAX_NUM_FUELCENS> Station;
 unsigned Num_fuelcenters;
 
-segment * PlayerSegment= NULL;
+const segment *PlayerSegment;
 
 #ifdef EDITOR
 const char	Special_names[MAX_CENTER_TYPES][11] = {
@@ -553,7 +553,7 @@ void fuelcen_update_all()
 #endif
 
 //-------------------------------------------------------------
-fix fuelcen_give_fuel(const vsegptr_t segp, fix MaxAmountCanTake )
+fix fuelcen_give_fuel(const vcsegptr_t segp, fix MaxAmountCanTake)
 {
 	static fix64 last_play_time = 0;
 	PlayerSegment = segp;
@@ -614,7 +614,7 @@ fix fuelcen_give_fuel(const vsegptr_t segp, fix MaxAmountCanTake )
 // DM/050904
 // Repair centers
 // use same values as fuel centers
-fix repaircen_give_shields(const vsegptr_t segp, fix MaxAmountCanTake )
+fix repaircen_give_shields(const vcsegptr_t segp, fix MaxAmountCanTake)
 {
 	static fix last_play_time=0;