diff --git a/lms/djangoapps/courseware/features/navigation.py b/lms/djangoapps/courseware/features/navigation.py
index edd748e46f..e0f82f9251 100644
--- a/lms/djangoapps/courseware/features/navigation.py
+++ b/lms/djangoapps/courseware/features/navigation.py
@@ -91,7 +91,7 @@ def click_on_section(step, section):
 @step(u'I click on subsection "([^"]*)"$')
 def click_on_subsection(step, subsection):
     subsection_css = 'ul[id="ui-accordion-accordion-panel-0"]> li > a'
-    world.css_find(subsection_css)[int(subsection) - 1].click()
+    world.css_click(subsection_css, index=(int(subsection) - 1))
 
 
 @step(u'I click on sequence "([^"]*)"$')
diff --git a/lms/templates/widgets/segment-io.html b/lms/templates/widgets/segment-io.html
index dea222653e..dd9787a77c 100644
--- a/lms/templates/widgets/segment-io.html
+++ b/lms/templates/widgets/segment-io.html
@@ -1,9 +1,7 @@
+% if settings.MITX_FEATURES.get('SEGMENT_IO_LMS'):
 <!-- begin Segment.io -->
 <script type="text/javascript">
-  // Leaving this line out of the feature flag block is intentional. Pulling the line outside of the if statement allows it to serve as its own dummy object.
   var analytics=analytics||[];analytics.load=function(e){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"===document.location.protocol?"https://":"http://")+"d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/"+e+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(t,n);var r=function(e){return function(){analytics.push([e].concat(Array.prototype.slice.call(arguments,0)))}},i=["identify","track","trackLink","trackForm","trackClick","trackSubmit","pageview","ab","alias","ready"];for(var s=0;s<i.length;s++)analytics[i[s]]=r(i[s])};
-
-% if settings.MITX_FEATURES.get('SEGMENT_IO_LMS'):
   analytics.load("${ settings.SEGMENT_IO_LMS_KEY }");
 
   % if user.is_authenticated():
@@ -13,6 +11,14 @@
   });
 
   % endif
-% endif
 </script>
 <!-- end Segment.io -->
+% else:
+<!-- dummy segment.io -->
+<script type="text/javascript">
+  var analytics = {
+    track: function() { return; }
+  };
+</script>
+<!-- end dummy segment.io -->
+% endif
\ No newline at end of file