diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java
index bbdc630ef..9bbda27fc 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java
@@ -740,7 +740,7 @@ public class FolderManipulator extends SimpleContainer implements
                 final CdiUtil cdiUtil = CdiUtil.createCdiUtil();
                 final FolderManager folderManager = cdiUtil.findBean(
                     FolderManager.class);
-                if (folder.getParentFolder() == null) {
+                if (!folderManager.getParentFolder(folder).isPresent()) {
                     folderTree.expand(Long.toString(folder.getObjectId()),
                                       state);
                 } else {
@@ -763,7 +763,7 @@ public class FolderManipulator extends SimpleContainer implements
         }
 
         public Folder getTarget(final PageState state) {
-            return (Folder) targetModel.getSelectedObject(state);
+            return targetModel.getSelectedObject(state);
         }
 
         public boolean isCancelled(final PageState state) {
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
index 61f67b7d4..516e4518b 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
@@ -160,8 +160,6 @@ public class CategoryManager {
         // by executing CategoryRepository#save(Category) as the system user.
         shiro.getSystemUser().execute(() -> {
             entityManager.persist(categorization);
-//            categoryRepo.save(assignedCategory);
-//            ccmObjectRepo.save(addedObject);
         });
     }