diff --git a/my-calendar-output.php.html b/my-calendar-output.php.html
index ab97513e4..7494cc47d 100644
--- a/my-calendar-output.php.html
+++ b/my-calendar-output.php.html
@@ -377,8 +377,8 @@
 				$params  = " aria-expanded='false'";
 				$classes = 'open';
 			}
-			$wrap    = "<button type='button' $params aria-controls='$container_id' class='$type $classes url summary$has_image'><span>";
-			$balance = '</span></button>';
+			$wrap    = "<button type='button' $params aria-controls='$container_id' class='$type $classes url summary$has_image'>";
+			$balance = '</button>';
 		}
 	} else {
 		$wrap    = '';
@@ -438,7 +438,7 @@
  * @return string
  */
 function mc_wrap_event( $content, $event, $container_id, $type ) {
-	$event_classes = mc_event_classes( $event, $type );
+	$event_classes = mc_get_event_classes( $event, $type );
 	$parent_id     = str_replace( 'details-', '', $container_id );
 	$header        = "<article id='$parent_id' class='$event_classes'>";