Index: Core/Common/test/Core.Common.Base.Test/Data/RoundedDoubleTest.cs
===================================================================
diff -u -r4cb56b1d97a0dd45602a673cbc1a2a7356feae01 -r0bf4bcd4f68d262ee5d66920d06aea97f54b5a1b
--- Core/Common/test/Core.Common.Base.Test/Data/RoundedDoubleTest.cs	(.../RoundedDoubleTest.cs)	(revision 4cb56b1d97a0dd45602a673cbc1a2a7356feae01)
+++ Core/Common/test/Core.Common.Base.Test/Data/RoundedDoubleTest.cs	(.../RoundedDoubleTest.cs)	(revision 0bf4bcd4f68d262ee5d66920d06aea97f54b5a1b)
@@ -330,8 +330,8 @@
             object someOtherObject = new object();
 
             // Call
-            var isEqual1 = roundedDouble.Equals(someOtherObject);
-            var isEqual2 = someOtherObject.Equals(roundedDouble);
+            bool isEqual1 = roundedDouble.Equals(someOtherObject);
+            bool isEqual2 = someOtherObject.Equals(roundedDouble);
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -350,8 +350,8 @@
             object comparisonRoundedDouble = new RoundedDouble(numberOfPlaces, value);
 
             // Call
-            var isEqual1 = baseRoundedDouble.Equals(comparisonRoundedDouble);
-            var isEqual2 = comparisonRoundedDouble.Equals(baseRoundedDouble);
+            bool isEqual1 = baseRoundedDouble.Equals(comparisonRoundedDouble);
+            bool isEqual2 = comparisonRoundedDouble.Equals(baseRoundedDouble);
 
             // Assert
             Assert.IsTrue(isEqual1);
@@ -385,8 +385,8 @@
             var roundedDouble2 = new RoundedDouble(1, 1.2);
 
             // Call
-            var isEqual1 = roundedDouble1 == roundedDouble2;
-            var isEqual2 = roundedDouble2 == roundedDouble1;
+            bool isEqual1 = roundedDouble1 == roundedDouble2;
+            bool isEqual2 = roundedDouble2 == roundedDouble1;
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -401,8 +401,8 @@
             var roundedDouble2 = new RoundedDouble(1, 1.2);
 
             // Call
-            var isEqual1 = roundedDouble1 == roundedDouble2;
-            var isEqual2 = roundedDouble2 == roundedDouble1;
+            bool isEqual1 = roundedDouble1 == roundedDouble2;
+            bool isEqual2 = roundedDouble2 == roundedDouble1;
 
             // Assert
             Assert.IsTrue(isEqual1);
@@ -420,8 +420,8 @@
             Assert.IsFalse(roundedDouble1.Equals(roundedDouble2));
 
             // Call
-            var isNotEqual1 = roundedDouble1 != roundedDouble2;
-            var isNotEqual2 = roundedDouble2 != roundedDouble1;
+            bool isNotEqual1 = roundedDouble1 != roundedDouble2;
+            bool isNotEqual2 = roundedDouble2 != roundedDouble1;
 
             // Assert
             Assert.IsTrue(isNotEqual1);
@@ -439,8 +439,8 @@
             Assert.IsTrue(roundedDouble1.Equals(roundedDouble2));
 
             // Call
-            var isNotEqual1 = roundedDouble1 != roundedDouble2;
-            var isNotEqual2 = roundedDouble2 != roundedDouble1;
+            bool isNotEqual1 = roundedDouble1 != roundedDouble2;
+            bool isNotEqual2 = roundedDouble2 != roundedDouble1;
 
             // Assert
             Assert.IsFalse(isNotEqual1);
@@ -457,8 +457,8 @@
             var roundedDouble = new RoundedDouble(numberOfDecimalPlaces, value);
 
             // Call
-            var isEqual1 = roundedDouble.Equals(value);
-            var isEqual2 = value.Equals(roundedDouble);
+            bool isEqual1 = roundedDouble.Equals(value);
+            bool isEqual2 = value.Equals(roundedDouble);
 
             // Assert
             Assert.IsTrue(isEqual1);
@@ -475,8 +475,8 @@
             var roundedDouble = new RoundedDouble(numberOfDecimalPlaces, value);
 
             // Call
-            var isEqual1 = roundedDouble.Equals(value);
-            var isEqual2 = value.Equals(roundedDouble);
+            bool isEqual1 = roundedDouble.Equals(value);
+            bool isEqual2 = value.Equals(roundedDouble);
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -491,8 +491,8 @@
             double otherValue = 4.56;
 
             // Call
-            var isEqual1 = roundedDouble.Equals(otherValue);
-            var isEqual2 = otherValue.Equals(roundedDouble);
+            bool isEqual1 = roundedDouble.Equals(otherValue);
+            bool isEqual2 = otherValue.Equals(roundedDouble);
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -510,8 +510,8 @@
             Assert.IsTrue(otherValue.Equals(roundedDouble));
 
             // Call
-            var hash1 = roundedDouble.GetHashCode();
-            var hash2 = otherValue.GetHashCode();
+            int hash1 = roundedDouble.GetHashCode();
+            int hash2 = otherValue.GetHashCode();
 
             // Assert
             Assert.AreEqual(hash1, hash2);
@@ -528,8 +528,8 @@
             Assert.IsTrue(roundedDouble.Equals(value));
 
             // Call
-            var isEqual1 = value == roundedDouble;
-            var isEqual2 = roundedDouble == value;
+            bool isEqual1 = value == roundedDouble;
+            bool isEqual2 = roundedDouble == value;
 
             // Assert
             Assert.IsTrue(isEqual1);
@@ -547,8 +547,8 @@
             Assert.IsFalse(roundedDouble.Equals(value));
 
             // Call
-            var isEqual1 = value == roundedDouble;
-            var isEqual2 = roundedDouble == value;
+            bool isEqual1 = value == roundedDouble;
+            bool isEqual2 = roundedDouble == value;
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -566,8 +566,8 @@
             Assert.IsTrue(roundedDouble.Equals(value));
 
             // Call
-            var isEqual1 = value != roundedDouble;
-            var isEqual2 = roundedDouble != value;
+            bool isEqual1 = value != roundedDouble;
+            bool isEqual2 = roundedDouble != value;
 
             // Assert
             Assert.IsFalse(isEqual1);
@@ -585,8 +585,8 @@
             Assert.IsFalse(roundedDouble.Equals(value));
 
             // Call
-            var isEqual1 = value != roundedDouble;
-            var isEqual2 = roundedDouble != value;
+            bool isEqual1 = value != roundedDouble;
+            bool isEqual2 = roundedDouble != value;
 
             // Assert
             Assert.IsTrue(isEqual1);
@@ -778,7 +778,7 @@
             var roundedDouble = new RoundedDouble(1, 10);
 
             // Call
-            var result = roundedDouble.CompareTo(null);
+            int result = roundedDouble.CompareTo(null);
 
             // Assert
             Assert.AreEqual(1, result);
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs
===================================================================
diff -u -rf4a7276cac4a5ca2648268ed42fa1fc53d45c1ac -r0bf4bcd4f68d262ee5d66920d06aea97f54b5a1b
--- Ringtoets/Common/src/Ringtoets.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs	(.../HydraulicBoundaryLocationEditor.cs)	(revision f4a7276cac4a5ca2648268ed42fa1fc53d45c1ac)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/UITypeEditors/HydraulicBoundaryLocationEditor.cs	(.../HydraulicBoundaryLocationEditor.cs)	(revision 0bf4bcd4f68d262ee5d66920d06aea97f54b5a1b)
@@ -39,8 +39,9 @@
 
         protected override SelectableHydraulicBoundaryLocation GetCurrentOption(ITypeDescriptorContext context)
         {
-            return GetPropertiesObject(context) != null
-                       ? GetPropertiesObject(context).SelectedHydraulicBoundaryLocation
+            IHasHydraulicBoundaryLocationProperty propertiesObject = GetPropertiesObject(context);
+            return propertiesObject != null
+                       ? propertiesObject.SelectedHydraulicBoundaryLocation
                        : null;
         }
     }