diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 096cef02b2b018b83ebad10c3e6406455eb02253..0141da1d0717a53065238f951528a59790f6b01a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -82,7 +82,7 @@ module ProjectsHelper
   end
 
   def project_active_milestones
-    @project.milestones.active.order("due_date, title ASC").all
+    @project.milestones.active.order("due_date, title ASC")
   end
 
   def project_issues_trackers(current_tracker = nil)
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml
index e56e9153c2fbc6c740475ba867cb96d884ebf9df..7dcc67127c1aa2d20563247275bc518b271ccabd 100644
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -10,7 +10,7 @@
           %i.icon-edit
           Edit
          
-        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove this comment?', remote: true, class: "danger js-note-delete" do
+        = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: "danger js-note-delete" do
           %i.icon-trash.cred
           Remove
     = image_tag avatar_icon(note.author_email), class: "avatar s32"
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 8156bcdd9992ba4a3d2cf65cf6b3a6e61da2f1d0..114058e3095ef6bfc29dc476a5527dd5a1b872ca 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -11,12 +11,12 @@ describe ProjectsHelper do
     it "returns the correct issues trackers available with current tracker 'gitlab' selected" do
       project_issues_trackers('gitlab').should ==
           "<option value=\"redmine\">Redmine</option>\n" \
-          "<option value=\"gitlab\" selected=\"selected\">GitLab</option>"
+          "<option selected=\"selected\" value=\"gitlab\">GitLab</option>"
     end
 
     it "returns the correct issues trackers available with current tracker 'redmine' selected" do
       project_issues_trackers('redmine').should ==
-          "<option value=\"redmine\" selected=\"selected\">Redmine</option>\n" \
+          "<option selected=\"selected\" value=\"redmine\">Redmine</option>\n" \
           "<option value=\"gitlab\">GitLab</option>"
     end
   end