diff --git a/packages/gestalt-datepicker/src/DateRange.tsx b/packages/gestalt-datepicker/src/DateRange.tsx
index 96881c6bb8..5828cf3a50 100644
--- a/packages/gestalt-datepicker/src/DateRange.tsx
+++ b/packages/gestalt-datepicker/src/DateRange.tsx
@@ -118,7 +118,7 @@ type Props = {
   readOnly?: boolean;
 };
 
-export enum DateRangeType {
+enum DateRangeType {
   Primary,
   Secondary,
 }
diff --git a/packages/gestalt-datepicker/src/DateRange/InternalDatePicker.tsx b/packages/gestalt-datepicker/src/DateRange/InternalDatePicker.tsx
index ee2fe2051e..6fb22cf7ae 100644
--- a/packages/gestalt-datepicker/src/DateRange/InternalDatePicker.tsx
+++ b/packages/gestalt-datepicker/src/DateRange/InternalDatePicker.tsx
@@ -11,7 +11,11 @@ import ReactDatePicker, { registerLocale } from 'react-datepicker';
 import { Icon, useDeviceType } from 'gestalt';
 import { Props } from '../DatePicker';
 import styles from '../DatePicker.css';
-import { DateRangeType } from '../DateRange';
+
+enum DateRangeType {
+  Primary,
+  Secondary,
+}
 
 type ModifiedProps = Props & {
   onChange: (arg1: { startDate: Date; endDate: Date }) => void;
diff --git a/packages/gestalt/src/ButtonGroup.tsx b/packages/gestalt/src/ButtonGroup.tsx
index 2d50b42a4c..0bd1bd859f 100644
--- a/packages/gestalt/src/ButtonGroup.tsx
+++ b/packages/gestalt/src/ButtonGroup.tsx
@@ -1,6 +1,6 @@
 import { Children, ReactNode } from 'react';
-import { Flex } from '.';
 import Box from './Box';
+import Flex from './Flex';
 import useInExperiment from './useInExperiment';
 
 type Props = {