diff --git a/src/climate.c b/src/climate.c
index dd2275be2a..6c1d4a1fd7 100644
--- a/src/climate.c
+++ b/src/climate.c
@@ -41,9 +41,9 @@ static const rct_weather_transition* climate_transitions[4];
 
 static void climate_determine_future_weather();
 
-int climate_celcius_to_fahrenheit(int celcius)
+int climate_celsius_to_fahrenheit(int celsius)
 {
-	return (celcius * 29) / 16 + 32;
+	return (celsius * 29) / 16 + 32;
 }
 
 /**
diff --git a/src/climate.h b/src/climate.h
index 2c035b86f7..814039f10f 100644
--- a/src/climate.h
+++ b/src/climate.h
@@ -41,7 +41,7 @@ typedef struct {
 extern int gClimateNextWeather;
 extern const rct_weather climate_weather_data[6];
 
-int climate_celcius_to_fahrenheit(int celcius);
+int climate_celsius_to_fahrenheit(int celsius);
 void climate_reset(int climate);
 void climate_update();
 
diff --git a/src/config.c b/src/config.c
index 97263fb994..ee2d964fdd 100644
--- a/src/config.c
+++ b/src/config.c
@@ -103,7 +103,7 @@ void config_load()
 				return;
 			RCT2_GLOBAL(0x009AB4C6, sint8) = 1;
 			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = 0; 
-			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FAHRENHEIT, sint8) = 1; 
+			RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = 1; 
 			RCT2_GLOBAL(0x009AACBB, sint8) = 1; 
 			RCT2_GLOBAL(0x009AACBD, sint16) = 0; 
 			if (!(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS))