diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index f31ffdda..67e557f4 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -351,14 +351,14 @@ class DmsfController < ApplicationController
     if selected_folders && selected_folders.is_a?(Array)
       selected_folders.each do |selected_folder_id|
         check_project(folder = DmsfFolder.visible.find(selected_folder_id))
-        zip.add_folder(folder, @folder.dmsf_path_str) if folder
+        zip.add_folder(folder, (@folder.dmsf_path_str if @folder)) if folder
       end
     end
     if selected_files && selected_files.is_a?(Array)
       selected_files.each do |selected_file_id|
         check_project(file = DmsfFile.visible.find(selected_file_id))        
         if file && file.last_revision && File.exists?(file.last_revision.disk_file)
-          zip.add_file(file, (@folder.dmsf_path_str if @folder))
+          zip.add_file(file, (@folder.dmsf_path_str if @folder)) if file          
         else
           raise FileNotFound
         end        
diff --git a/app/views/dmsf_folders_copy/new.html.erb b/app/views/dmsf_folders_copy/new.html.erb
index 7ade03d2..1eff4ad5 100644
--- a/app/views/dmsf_folders_copy/new.html.erb
+++ b/app/views/dmsf_folders_copy/new.html.erb
@@ -21,7 +21,7 @@
 
 <div class="contextual"></div>
 
-<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %>
+<%= render(:partial => '/dmsf/path', :locals => {:folder => @folder, :filename => nil}) %>
 
 <% unless DmsfFolder.allowed_target_projects_on_copy.blank? %>
   <%= form_tag({:action => 'copy_to', :id => @folder}, :id => 'copyForm') do |f| %>
diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb
index 959a8ea4..aff97ed5 100644
--- a/app/views/dmsf_workflows/_log.html.erb
+++ b/app/views/dmsf_workflows/_log.html.erb
@@ -71,7 +71,7 @@
                 <td><%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %></td>
               </tr>
               <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step FROM dmsf_workflow_step_actions c RIGHT JOIN dmsf_workflow_step_assignments a ON a.id = c.dmsf_workflow_step_assignment_id RIGHT JOIN dmsf_workflow_steps s ON s.id = a.dmsf_workflow_step_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY s.step, c.action DESC, c.created_at" %>
-              <% result = DmsfWorkflowStep.connection.execute sql %>                                                                                                
+              <% result = DmsfWorkflowStep.connection.exec_query sql %>                                                                                                
               <% result.each_with_index do |row, i| %>
                 <tr id="step-<%= i + 3 %> " class="<%= cycle 'odd', 'even' %>">
                   <td class="step"><%= row['step'] %></td>