diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index b12dcd841164949cd8e5ee78c301c30e794dbb56..954dbe5d2b9079c39f6fd76c1ee8bf8545e9c6b0 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -66,7 +66,7 @@
           %span
             CI Services
       = nav_link path: 'events#index' do
-        = link_to ci_project_events_path(@project.ensure_gitlab_ci_project) do
+        = link_to ci_project_events_path(@project.gitlab_ci_project) do
           = icon('book fw')
           %span
             CI Events
diff --git a/app/views/projects/builds/_build.html.haml b/app/views/projects/builds/_build.html.haml
index e74a3a62672a089f6a4aed4d4460237c6defef36..ff146f7389bedb2b13e19e437651b1e986837492 100644
--- a/app/views/projects/builds/_build.html.haml
+++ b/app/views/projects/builds/_build.html.haml
@@ -29,9 +29,9 @@
         - build.tags.each do |tag|
           %span.label.label-primary
             = tag
-      - if build.try(:trigger_request)
+      - if build.trigger_request
         %span.label.label-info triggered
-      - if build.try(:allow_failure)
+      - if build.allow_failure
         %span.label.label-danger allowed to fail
 
   %td.duration