diff --git a/Gemfile.lock b/Gemfile.lock
index 79a3d3dd..56695874 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,7 +125,6 @@ GEM
       simplecov
     coderay (1.1.1)
     concurrent-ruby (1.1.7)
-    connection_pool (2.2.2)
     countable-rails (0.0.1)
       railties (>= 3.1)
     countries (3.0.0)
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index ea5972b0..0c135c32 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -209,7 +209,7 @@ module EventsHelper
       action: 'TEMPLATE',
       text: "#{event.title} at #{conference.title}",
       details: calendar_event_text(event, event_schedule, conference),
-      location: "#{event.room.name} #{event.room&.url}",
+      location: "#{event.room.name} #{event.url}",
       dates: "#{start_timestamp}/#{end_timestamp}",
       ctz: event_schedule.timezone
     }
@@ -223,10 +223,10 @@ module EventsHelper
     #{conference.title} - #{event.title}
     #{event_schedule.start_time.strftime("%Y %B %e - %H:%M")} #{event_schedule.timezone}
 
-    More Info: #{event.url}
-    Join: #{event.room&.url}
+    More Info: #{conference_program_proposal_url(conference, event)}
+    Join: #{event.url}
 
-    #{truncate(event.abstract, length: 200)}"
+    #{truncate(event.abstract, length: 200)}
     TEXT
   end