Index: Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs
===================================================================
diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r61fba30061819e93d79682d4c85367790267c79a
--- Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs	(.../AvalonDockViewHost.xaml.cs)	(revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewHost/AvalonDockViewHost.xaml.cs	(.../AvalonDockViewHost.xaml.cs)	(revision 61fba30061819e93d79682d4c85367790267c79a)
@@ -210,12 +210,19 @@
 
         public void BringToFront(IView view)
         {
-            LayoutContent layoutContent = documentViews.Contains(view)
-                                              ? (LayoutContent) GetLayoutContent<LayoutDocument>(view)
-                                              : toolViews.Contains(view)
-                                                  ? GetLayoutContent<LayoutAnchorable>(view)
-                                                  : null;
+            LayoutContent layoutContent;
 
+            if (documentViews.Contains(view))
+            {
+                layoutContent = GetLayoutContent<LayoutDocument>(view);
+            }
+            else
+            {
+                layoutContent = toolViews.Contains(view)
+                                    ? GetLayoutContent<LayoutAnchorable>(view)
+                                    : null;
+            }
+
             BringToFront(layoutContent);
 
             OnViewBroughtToFront(view);
Index: Riskeer/Common/src/Riskeer.Common.Service/RiskeerCommonDataCalculationService.cs
===================================================================
diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -r61fba30061819e93d79682d4c85367790267c79a
--- Riskeer/Common/src/Riskeer.Common.Service/RiskeerCommonDataCalculationService.cs	(.../RiskeerCommonDataCalculationService.cs)	(revision ae6913dc9e65387cd005077a2f056b5cd2fd159f)
+++ Riskeer/Common/src/Riskeer.Common.Service/RiskeerCommonDataCalculationService.cs	(.../RiskeerCommonDataCalculationService.cs)	(revision 61fba30061819e93d79682d4c85367790267c79a)
@@ -45,11 +45,14 @@
         /// <see cref="CalculationConvergence.NotCalculated"/> if no convergence was determined.</returns>
         public static CalculationConvergence GetCalculationConvergence(bool? converged)
         {
-            return converged.HasValue
-                       ? converged.Value
-                             ? CalculationConvergence.CalculatedConverged
-                             : CalculationConvergence.CalculatedNotConverged
-                       : CalculationConvergence.NotCalculated;
+            if (converged.HasValue)
+            {
+                return converged.Value
+                           ? CalculationConvergence.CalculatedConverged
+                           : CalculationConvergence.CalculatedNotConverged;
+            }
+
+            return CalculationConvergence.NotCalculated;
         }
 
         /// <summary>
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/BackgroundDataProperties.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r61fba30061819e93d79682d4c85367790267c79a
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/BackgroundDataProperties.cs	(.../BackgroundDataProperties.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/BackgroundDataProperties.cs	(.../BackgroundDataProperties.cs)	(revision 61fba30061819e93d79682d4c85367790267c79a)
@@ -61,11 +61,14 @@
             {
                 var configuration = data.Configuration as WmtsBackgroundDataConfiguration;
 
-                return configuration != null
-                           ? configuration.IsConfigured
-                                 ? data.Name
-                                 : string.Empty
-                           : data.Name;
+                if (configuration != null)
+                {
+                    return configuration.IsConfigured
+                               ? data.Name
+                               : string.Empty;
+                }
+
+                return data.Name;
             }
         }
 
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r356423bfc298b67f53cf5b7c78765e9f96fa9295 -r61fba30061819e93d79682d4c85367790267c79a
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 356423bfc298b67f53cf5b7c78765e9f96fa9295)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 61fba30061819e93d79682d4c85367790267c79a)
@@ -923,12 +923,15 @@
                 ForeColor = data =>
                 {
                     var configuration = data.Configuration as WmtsBackgroundDataConfiguration;
-                    return configuration != null
-                           && configuration.IsConfigured
-                               ? Color.FromKnownColor(KnownColor.ControlText)
-                               : Color.FromKnownColor(configuration == null
-                                                          ? KnownColor.ControlText
-                                                          : KnownColor.GrayText);
+
+                    if (configuration != null && configuration.IsConfigured)
+                    {
+                        return Color.FromKnownColor(KnownColor.ControlText);
+                    }
+
+                    return Color.FromKnownColor(configuration == null
+                                                    ? KnownColor.ControlText
+                                                    : KnownColor.GrayText);
                 }
             };