diff --git a/src/components/modal/__snapshots__/confirm_modal.test.js.snap b/src/components/modal/__snapshots__/confirm_modal.test.js.snap
index f5de9ab24868..cf7035a76350 100644
--- a/src/components/modal/__snapshots__/confirm_modal.test.js.snap
+++ b/src/components/modal/__snapshots__/confirm_modal.test.js.snap
@@ -60,9 +60,9 @@ exports[`renders EuiConfirmModal 1`] = `
       class="euiModalFooter"
     >
       <button
-        class="euiButtonEmpty"
+        class="euiButtonEmpty euiButtonEmpty--primary"
         data-test-subj="confirmModalCancelButton"
-        type="confirm"
+        type="button"
       >
         <span
           class="euiButtonEmpty__content"
diff --git a/src/components/modal/confirm_modal.js b/src/components/modal/confirm_modal.js
index 32806edc8bb4..f4cc5fcbf8ac 100644
--- a/src/components/modal/confirm_modal.js
+++ b/src/components/modal/confirm_modal.js
@@ -137,6 +137,6 @@ EuiConfirmModal.propTypes = {
   type: PropTypes.oneOf(MODAL_TYPES),
 };
 
-EuiButtonEmpty.defaultProps = {
+EuiConfirmModal.defaultProps = {
   type: 'confirm',
 };
diff --git a/src/components/tabs/_tabs.scss b/src/components/tabs/_tabs.scss
index 10ab56836ea3..abf47c25e4f9 100644
--- a/src/components/tabs/_tabs.scss
+++ b/src/components/tabs/_tabs.scss
@@ -4,6 +4,12 @@
   max-width: 100%;
   overflow-x: auto;
   overflow-y: hidden; // don't scroll vertically when scrolling horizontally
+  @include euiScrollBar;
+
+  // Changing height of scrollbar so it sits flush with border
+  &::-webkit-scrollbar {
+    height: 3px;
+  }
 
   &.euiTabs--small {
     .euiTab {
@@ -65,6 +71,9 @@
 
   .euiTab__content {
     display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
     transition: transform $euiAnimSpeedFast $euiAnimSlightBounce;
     transform: translateY(0);
   }