diff --git a/src/jquery.cycle2.autoheight.js b/src/jquery.cycle2.autoheight.js
index f7615a8..ebd003e 100644
--- a/src/jquery.cycle2.autoheight.js
+++ b/src/jquery.cycle2.autoheight.js
@@ -18,7 +18,6 @@ $(document).on( 'cycle-initialized', function( e, opts ) {
         return;
 
     // bind events
-    opts.container.on( 'cycle-slide-added cycle-slide-removed', initAutoHeight );
     opts.container.on( 'cycle-destroyed', onDestroy );
 
     if ( autoHeight == 'container' ) {
@@ -31,15 +30,15 @@ $(document).on( 'cycle-initialized', function( e, opts ) {
         opts._autoHeightRatio = ratio;
     }
 
-    // if autoHeight is a number then we don't need to recalculate the sentinel
-    // index on resize
+    // if autoHeight is calc or ratio then we need to recalculate the sentinel
+    // index on resize, and also on slide-added/slide-removed
     if ( t !== 'number' ) {
         // bind unique resize handler per slideshow (so it can be 'off-ed' in onDestroy)
         opts._autoHeightOnResize = function () {
             clearTimeout( resizeThrottle );
             resizeThrottle = setTimeout( onResize, 50 );
         };
-
+        opts.container.on( 'cycle-slide-added cycle-slide-removed', opts._autoHeightOnResize );
         $(window).on( 'resize orientationchange', opts._autoHeightOnResize );
     }
 
diff --git a/src/jquery.cycle2.pager.js b/src/jquery.cycle2.pager.js
index 1732e76..5d066bc 100644
--- a/src/jquery.cycle2.pager.js
+++ b/src/jquery.cycle2.pager.js
@@ -7,7 +7,7 @@ $.extend($.fn.cycle.defaults, {
     pagerActiveClass: 'cycle-pager-active',
     pagerEvent:       'click.cycle',
     pagerEventBubble: undefined,
-    pagerTemplate:    '<span>&bull;</span>'
+    pagerTemplate:    '<button>&bull;</button>'
 });
 
 $(document).on( 'cycle-bootstrap', function( e, opts, API ) {