diff --git a/src/libs/confscreens/graphconfig.cpp b/src/libs/confscreens/graphconfig.cpp
index 4bc479a6..271aec4b 100644
--- a/src/libs/confscreens/graphconfig.cpp
+++ b/src/libs/confscreens/graphconfig.cpp
@@ -51,10 +51,6 @@ static int 	SkyDomeValueIndex = 0;
 static int	DynamicTimeOptionId;
 static int	DynamicTimeOptionValue = 0;
 
-
-//static int	RainDensityOptionId;
-//static int	RainDensityValueIndex = 0;
-
 static const int SkyDomeSizeValues[] = {0, 12000, 20000, 40000, 80000};
 static const int NbSkyDomeValues = sizeof(SkyDomeSizeValues) / sizeof(SkyDomeSizeValues[0]);
 //static const int RainDensityValues[] = {0, 100, 200, 300};
diff --git a/src/libs/racescreens/racemenu.cpp b/src/libs/racescreens/racemenu.cpp
index 8af8c0ec..a083f576 100644
--- a/src/libs/racescreens/racemenu.cpp
+++ b/src/libs/racescreens/racemenu.cpp
@@ -232,7 +232,7 @@ rmrpValidate(void * /* dummy */)
 	GfParmSetNum(rp->param, rp->title, RM_ATTR_DISTANCE, "km", rmrpDistance);
 	GfParmSetNum(rp->param, rp->title, RM_ATTR_LAPS, (char*)NULL, rmrpLaps);
 	GfParmSetNum(rp->param, rp->title, RM_ATTR_SESSIONTIME, "s", (tdble)rmrpSessionTime);
-	GfParmSetNum(rp->param, rp->title, RM_ATTR_WEATHER, NULL, rmrpWeather + 1); //TODO: delete this line
+	//GfParmSetNum(rp->param, rp->title, RM_ATTR_WEATHER, NULL, rmrpWeather + 1); //TODO: delete this line
 	GfParmSetNum(rp->param, rp->title, RM_ATTR_WEATHER_RAIN, "l/m2/h", WeatherValues[rmrpWeather].rain);
 	switch( WeatherValues[rmrpWeather ].clouds )
 	{
@@ -375,7 +375,7 @@ RmRaceParamMenu(void *vrp)
 	{
 		rmrpWeather = xx;
 	}
-    	else if( fabs( WeatherValues[ xx          ].rain - GfParmGetNum(rp->param, rp->title, RM_ATTR_WEATHER_RAIN, "l/m2/h", 0.0f ) ) <
+    	if( fabs( WeatherValues[ xx          ].rain - GfParmGetNum(rp->param, rp->title, RM_ATTR_WEATHER_RAIN, "l/m2/h", 0.0f ) ) ==
 	         fabs( WeatherValues[ rmrpWeather ].rain - GfParmGetNum(rp->param, rp->title, RM_ATTR_WEATHER_RAIN, "l/m2/h", 0.0f ) ) )
 	{
 		//Rain is equal far off, look if we have a match in the cloud type