diff --git a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
index 05ae879c20..582f9a40f7 100644
--- a/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs
@@ -16,11 +16,6 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
         public virtual string TableName { get; set; }
         public virtual string ColumnName { get; set; }
 
-        [Obsolete("Use the IndexType property instead and set it to IndexTypes.UniqueNonClustered")]
-        public virtual bool IsUnique { get; set; }
-
-        [Obsolete("Use the IndexType property instead and set it to IndexTypes.Clustered")]
-        public bool IsClustered { get; set; }
         public virtual ICollection<IndexColumnDefinition> Columns { get; set; }
         public IndexTypes IndexType { get; set; }
     }
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
index 23c7c055f8..b14c7659a3 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/UserRepository.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         public IProfile GetProfile(string username)
         {
-            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.UserName == username), false);
+            var dto = GetDtoWith(sql => sql.Where<UserDto>(x => x.Login == username), false);
             return dto == null ? null : new UserProfile(dto.Id, dto.UserName);
         }
 
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index aadea82dd4..1d04462836 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -888,7 +888,8 @@ namespace Umbraco.Core.Services.Implement
 
                 var originalPath = media.Path;
 
-                var moveEventArgs = new MoveEventArgs<IMedia>(true, evtMsgs, new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia));
+                var moveEventInfo = new MoveEventInfo<IMedia>(media, originalPath, Constants.System.RecycleBinMedia);
+                var moveEventArgs = new MoveEventArgs<IMedia>(true, evtMsgs, moveEventInfo);
                 if (scope.Events.DispatchCancelable(Trashing, this, moveEventArgs, nameof(Trashing)))
                 {
                     scope.Complete();
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
index 2c8887ef3f..47ec4a83cc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
@@ -77,7 +77,13 @@ angular.module("umbraco.directives")
                 //is this the current action node (this is not the same as the current selected node!)
                 var actionNode = appState.getMenuState("currentNode");
                 if (actionNode) {
-                    if (actionNode.id === node.id) {
+                    if (actionNode.id === node.id && String(actionNode.id) !== "-1") {
+                        css.push("active");
+                    }
+
+                    // special handling of root nodes with id -1 
+                    // as there can be many nodes with id -1 in a tree we need to check the treeAlias instead
+                    if (String(actionNode.id) === "-1" && actionNode.metaData.treeAlias === node.metaData.treeAlias) {
                         css.push("active");
                     }
                 }