diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsx
index 46c72597..2a076d42 100644
--- a/src/components/input/SettingsButton.tsx
+++ b/src/components/input/SettingsButton.tsx
@@ -15,12 +15,7 @@ export function SettingsButton() {
           <Icons.Gear />
         </Icon>
       </Button>
-      <Popup
-        className={styles.popup}
-        position="bottom"
-        alignment="end"
-        onClick={e => e.stopPropagation()}
-      >
+      <Popup className={styles.popup} position="bottom" alignment="end">
         <Form>
           <FormRow label={formatMessage(labels.timezone)}>
             <TimezoneSetting />
diff --git a/src/components/metrics/OSTable.tsx b/src/components/metrics/OSTable.tsx
index e8b8e81f..c39cba22 100644
--- a/src/components/metrics/OSTable.tsx
+++ b/src/components/metrics/OSTable.tsx
@@ -2,14 +2,20 @@ import MetricsTable from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
 import useMessages from 'components/hooks/useMessages';
 
+const names = {
+  'Mac OS': 'macOS',
+  'Chrome OS': 'ChromeOS',
+  'Sun OS': 'SunOS',
+};
+
 export function OSTable({ websiteId, limit }: { websiteId: string; limit?: number }) {
   const { formatMessage, labels } = useMessages();
 
   function renderLink({ x: os }) {
     return (
-      <FilterLink id="os" value={os}>
+      <FilterLink id="os" value={names[os] || os}>
         <img
-          src={`${process.env.basePath}/images/os/${
+          src={`${process.env.basePath || ''}/images/os/${
             os?.toLowerCase().replaceAll(/\W/g, '-') || 'unknown'
           }.png`}
           alt={os}