diff --git a/vuu-ui/packages/vuu-table/src/table-next/header-cell/HeaderCell.css b/vuu-ui/packages/vuu-table/src/table-next/header-cell/HeaderCell.css
index 854991cc3..19eeeb4f9 100644
--- a/vuu-ui/packages/vuu-table/src/table-next/header-cell/HeaderCell.css
+++ b/vuu-ui/packages/vuu-table/src/table-next/header-cell/HeaderCell.css
@@ -50,7 +50,7 @@
 }
 
   .vuuTableNextHeaderCell.vuuPinLeft.vuuEndPin .vuuColumnResizerNext:before {
-    --height: calc(var(--table-height) - 15px);
+    --height: calc(var(--table-height) - var(--horizontal-scrollbar-height));
     --inset-r: calc(var(--pin-width) - 2px);
     --inset-b: calc(var(--height) - 2px);
     --clip-path: polygon(
@@ -85,7 +85,7 @@
 }
 
 .vuuTableNextHeaderCell.vuuPinRight.vuuEndPin .vuuColumnResizerNext:before {
-  --height: calc(var(--table-height) - 15px);
+  --height: calc(var(--table-height) - var(--horizontal-scrollbar-height));
   --inset-r: calc(var(--pin-width) - 2px);
   --inset-b: calc(var(--height) - 2px);
   --clip-path: polygon(
diff --git a/vuu-ui/packages/vuu-ui-controls/src/cycle-state-button/CycleStateButton.tsx b/vuu-ui/packages/vuu-ui-controls/src/cycle-state-button/CycleStateButton.tsx
index 1b8d98606..679230cee 100644
--- a/vuu-ui/packages/vuu-ui-controls/src/cycle-state-button/CycleStateButton.tsx
+++ b/vuu-ui/packages/vuu-ui-controls/src/cycle-state-button/CycleStateButton.tsx
@@ -16,7 +16,7 @@ export interface CycleStateButtonProps extends ButtonProps {
 }
 
 const getNextValue = (value: string, valueList: string[]) => {
-  const index = valueList.indexOf(value);
+  const index = valueList.indexOf(value.toUpperCase());
   if (index === valueList.length - 1) {
     return valueList[0];
   } else {