diff --git a/packages/website/src/components/DocContainer.tsx b/packages/website/src/components/DocContainer.tsx
index a758ce4b0..6fab957a7 100644
--- a/packages/website/src/components/DocContainer.tsx
+++ b/packages/website/src/components/DocContainer.tsx
@@ -133,7 +133,7 @@ export function DocContainer({
 			{(kind === 'Class' || kind === 'Interface') && (methods?.length || properties?.length) ? (
 				<MediaQuery smallerThan="lg" styles={{ display: 'none' }}>
 					<Aside hiddenBreakpoint="lg" width={{ lg: 250 }} withBorder>
-						<ScrollArea p="xs">
+						<ScrollArea p="xs" offsetScrollbars>
 							<TableOfContentItems properties={properties ?? []} methods={methods ?? []}></TableOfContentItems>
 						</ScrollArea>
 					</Aside>
diff --git a/packages/website/src/components/ParameterTable.tsx b/packages/website/src/components/ParameterTable.tsx
index a8718b0b2..8670ba180 100644
--- a/packages/website/src/components/ParameterTable.tsx
+++ b/packages/website/src/components/ParameterTable.tsx
@@ -19,7 +19,7 @@ export function ParameterTable({ data }: { data: ParameterDocumentation[] }) {
 
 	return (
 		<Box>
-			<ScrollArea type="auto">
+			<ScrollArea offsetScrollbars>
 				<Table columns={['Name', 'Type', 'Optional', 'Description']} rows={rows} columnStyles={columnStyles} />
 			</ScrollArea>
 		</Box>
diff --git a/packages/website/src/components/TypeParamTable.tsx b/packages/website/src/components/TypeParamTable.tsx
index 497755c6d..ed27b6015 100644
--- a/packages/website/src/components/TypeParamTable.tsx
+++ b/packages/website/src/components/TypeParamTable.tsx
@@ -21,7 +21,7 @@ export function TypeParamTable({ data }: { data: TypeParameterData[] }) {
 
 	return (
 		<Box sx={{ overflowX: 'auto' }}>
-			<ScrollArea type="auto">
+			<ScrollArea offsetScrollbars>
 				<Table
 					columns={['Name', 'Constraints', 'Optional', 'Default', 'Description']}
 					rows={rows}
diff --git a/packages/website/src/pages/docs/[...slug].tsx b/packages/website/src/pages/docs/[...slug].tsx
index d241743af..52d2fea72 100644
--- a/packages/website/src/pages/docs/[...slug].tsx
+++ b/packages/website/src/pages/docs/[...slug].tsx
@@ -179,7 +179,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
 	} catch {
 		return {
 			props: {
-				error: 'FetchError',
+				notFound: true,
 			},
 		};
 	}
diff --git a/packages/website/src/pages/docs/packages/[package]/index.tsx b/packages/website/src/pages/docs/packages/[package]/index.tsx
index 9d1dfbf0f..cbbbf1717 100644
--- a/packages/website/src/pages/docs/packages/[package]/index.tsx
+++ b/packages/website/src/pages/docs/packages/[package]/index.tsx
@@ -29,6 +29,12 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const data: string[] = await res.json();
 
+		if (!data.length) {
+			return {
+				notFound: true,
+			};
+		}
+
 		return {
 			props: {
 				packageName,
@@ -37,10 +43,10 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
 				},
 			},
 		};
-	} catch (error) {
+	} catch {
 		return {
 			props: {
-				error: 'FetchError',
+				notFound: true,
 			},
 		};
 	}