diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index b90aee45..67b09af8 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -12,7 +12,6 @@
     = f.password_field :password_confirmation, autocomplete: "off", label: t('views.settings.account.password_confirm')
 
     %p= raw t('views.sessions.info', terms: link_to(t('views.general.terms'), terms_path))
-      = link_to "Terms of Service", terms_path
     = f.submit "Sign up"
 
   = render "devise/shared/links"
diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml
index 93a442c4..30bb5642 100644
--- a/app/views/layouts/_notifications.html.haml
+++ b/app/views/layouts/_notifications.html.haml
@@ -47,7 +47,7 @@
                   %h6.media-heading.notification--dropdown-user
                     = user_screen_name notification.target.user
                   .notification--dropdown-text
-                    = raw t('views.notifications.smile.body', content: link_to(t('views.notifications.smile.comment'), show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)), time: time_ago_in_words(notification.target.created_at))
+                    = raw t('views.notifications.smile.body', content: link_to(t('views.notifications.smile.comment'), show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.comment.answer.id)), time: time_ago_in_words(notification.target.created_at))
               - when "Comment"
                 .pull-left
                   %img.img-rounded.notification--dropdown-img{src: gravatar_url(notification.target.user)}
diff --git a/app/views/notifications/_notification.html.haml b/app/views/notifications/_notification.html.haml
index 1cfd3de2..195ac857 100644
--- a/app/views/notifications/_notification.html.haml
+++ b/app/views/notifications/_notification.html.haml
@@ -38,7 +38,7 @@
           %h6.media-heading.notification--user
             = user_screen_name notification.target.user
           %p.notification--text
-            = raw t('views.notifications.smile.body', content: link_to(t('views.notifications.smile.comment'), show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.answer.id)), time: time_tooltip(notification.target))
+            = raw t('views.notifications.smile.body', content: link_to(t('views.notifications.smile.comment'), show_user_answer_path(username: notification.target.user.screen_name, id: notification.target.comment.answer.id)), time: time_tooltip(notification.target))
           .notification--icon
             %i.fa.fa-smile-o
       - when "Comment"