diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
index 633e9cb9f5..664c246b14 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/mediapicker.controller.js
@@ -58,7 +58,7 @@ function mediaPickerController($scope, dialogService, entityResource, $log, icon
 
     //load media data
     var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
-    entityResource.getByIds(modelIds, $scope.cfg.entityType).then(function (data) {
+    entityResource.getByIds(modelIds, dialogOptions.entityType).then(function (data) {
         _.each(data, function (item, i) {
             item.icon = iconHelper.convertFromLegacyIcon(item.icon);
             $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon });
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
index 264d90f36d..81817da200 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
@@ -211,7 +211,7 @@ namespace Umbraco.Web.Models.Mapping
                 }
                 
                 //then we'll just use the root group's data to make the composite tab
-                var rootGroup = propertyGroups.Single(x => x.ParentId == null);
+                var rootGroup = propertyGroups.First(x => x.ParentId == null);
                 aggregateTabs.Add(new Tab<ContentPropertyDisplay>
                     {
                         Id = rootGroup.Id,