diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs
index 4903e0fe..16c469bf 100644
--- a/MapControl/Shared/MapItemsControl.cs
+++ b/MapControl/Shared/MapItemsControl.cs
@@ -34,7 +34,7 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Wrapper for the MapPanel.AutoCollapse attached property.
+        /// Gets/sets MapPanel.AutoCollapse.
         /// </summary>
         public bool AutoCollapse
         {
@@ -43,7 +43,7 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Wrapper for the MapPanel.Location attached property.
+        /// Gets/sets MapPanel.Location.
         /// </summary>
         public Location Location
         {
diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs
index 89cadfd9..63ec8ef1 100644
--- a/MapControl/Shared/MapPanel.cs
+++ b/MapControl/Shared/MapPanel.cs
@@ -18,7 +18,7 @@ using System.Windows.Media;
 namespace MapControl
 {
     /// <summary>
-    /// Optional interface to hold the value of the MapPanel.ParentMap attached property.
+    /// Optional interface to hold the value of the attached property MapPanel.ParentMap.
     /// </summary>
     public interface IMapElement
     {
diff --git a/MapControl/Shared/Pushpin.cs b/MapControl/Shared/Pushpin.cs
index 29cf8e75..b073f2f3 100644
--- a/MapControl/Shared/Pushpin.cs
+++ b/MapControl/Shared/Pushpin.cs
@@ -20,11 +20,11 @@ namespace MapControl
 #if WINDOWS_UWP
         public static readonly DependencyProperty AutoCollapseProperty = DependencyProperty.Register(
             nameof(AutoCollapse), typeof(bool), typeof(Pushpin),
-            new PropertyMetadata(false, (o, e) => MapPanel.SetAutoCollapse((FrameworkElement)o, (bool)e.NewValue)));
+            new PropertyMetadata(false, (o, e) => MapPanel.SetAutoCollapse((Pushpin)o, (bool)e.NewValue)));
 
         public static readonly DependencyProperty LocationProperty = DependencyProperty.Register(
             nameof(Location), typeof(Location), typeof(Pushpin),
-            new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((FrameworkElement)o, (Location)e.NewValue)));
+            new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((Pushpin)o, (Location)e.NewValue)));
 #else
         public static readonly DependencyProperty AutoCollapseProperty = MapPanel.AutoCollapseProperty.AddOwner(typeof(Pushpin));
 
@@ -38,7 +38,7 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Wrapper for the MapPanel.AutoCollapse attached property.
+        /// Gets/sets MapPanel.AutoCollapse.
         /// </summary>
         public bool AutoCollapse
         {
@@ -47,7 +47,7 @@ namespace MapControl
         }
 
         /// <summary>
-        /// Wrapper for the MapPanel.Location attached property.
+        /// Gets/sets MapPanel.Location.
         /// </summary>
         public Location Location
         {
diff --git a/MapControl/UWP/MapItemsControl.UWP.cs b/MapControl/UWP/MapItemsControl.UWP.cs
index a1045524..1efb1af1 100644
--- a/MapControl/UWP/MapItemsControl.UWP.cs
+++ b/MapControl/UWP/MapItemsControl.UWP.cs
@@ -13,11 +13,11 @@ namespace MapControl
     {
         public static readonly DependencyProperty AutoCollapseProperty = DependencyProperty.Register(
             nameof(AutoCollapse), typeof(bool), typeof(MapItem),
-            new PropertyMetadata(false, (o, e) => MapPanel.SetAutoCollapse((FrameworkElement)o, (bool)e.NewValue)));
+            new PropertyMetadata(false, (o, e) => MapPanel.SetAutoCollapse((MapItem)o, (bool)e.NewValue)));
 
         public static readonly DependencyProperty LocationProperty = DependencyProperty.Register(
             nameof(Location), typeof(Location), typeof(MapItem),
-            new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((FrameworkElement)o, (Location)e.NewValue)));
+            new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((MapItem)o, (Location)e.NewValue)));
 
         protected override void OnPointerPressed(PointerRoutedEventArgs e)
         {