Tweaks to FolderCommandsDAO