diff --git a/src/FitRideFile.cpp b/src/FitRideFile.cpp
index 9f7791ed8..374c95c31 100644
--- a/src/FitRideFile.cpp
+++ b/src/FitRideFile.cpp
@@ -304,6 +304,7 @@ struct FitFileReaderState
                 case 1561: case 1742: case 1821: rideFile->setDeviceType("Garmin Edge 510"); break;
                 case 1567: rideFile->setDeviceType("Garmin Edge 810"); break;
                 case 1623: rideFile->setDeviceType("Garmin FR620"); break;
+                case 1632: rideFile->setDeviceType("Garmin FR220"); break;
                 case 1765: case 2130: case 2131: case 2132: rideFile->setDeviceType("Garmin FR920XT"); break;
                 case 1836: case 2052: case 2053: case 2070: case 2100: rideFile->setDeviceType("Garmin Edge 1000"); break;
                 case 1903: rideFile->setDeviceType("Garmin FR15"); break;
diff --git a/src/FixDerivePower.cpp b/src/FixDerivePower.cpp
index 6fe37ed65..66c70a756 100644
--- a/src/FixDerivePower.cpp
+++ b/src/FixDerivePower.cpp
@@ -54,13 +54,9 @@ class FixDerivePowerConfig : public DataProcessorConfig
             HelpWhatsThis *help = new HelpWhatsThis(parent);
             parent->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Edit_EstimatePowerValues));
 
-            layoutV = new QVBoxLayout(this);
-            layout = new QHBoxLayout();
-            windLayout = new QHBoxLayout();
+            layout = new QHBoxLayout(this);
 
             layout->setContentsMargins(0,0,0,0);
-            layoutV->setContentsMargins(0,0,0,0);
-            windLayout->setContentsMargins(0,0,0,0);
             setContentsMargins(0,0,0,0);
 
             bikeWeightLabel = new QLabel(tr("Bike Weight (kg)"));
@@ -96,17 +92,13 @@ class FixDerivePowerConfig : public DataProcessorConfig
             layout->addWidget(bikeWeight);
             layout->addWidget(crrLabel);
             layout->addWidget(crr);
-            windLayout->addWidget(windSpeedLabel);
-            windLayout->addWidget(windSpeed);
-            windLayout->addWidget(windHeadingLabel);
-            windLayout->addWidget(windHeading);
-
-            layoutV->addLayout(layout);
-            layoutV->addLayout(windLayout);
+            layout->addWidget(windSpeedLabel);
+            layout->addWidget(windSpeed);
+            layout->addWidget(windHeadingLabel);
+            layout->addWidget(windHeading);
 
             layout->addStretch();
-            layoutV->addStretch();
-            windLayout->addStretch();
+
         }
 
         //~FixDerivePowerConfig() {} // deliberately not declared since Qt will delete