diff --git a/src/components/Form/DynamicForm.tsx b/src/components/Form/DynamicForm.tsx
index d6b7ef4c..1bb0a6d6 100644
--- a/src/components/Form/DynamicForm.tsx
+++ b/src/components/Form/DynamicForm.tsx
@@ -6,6 +6,7 @@ import { Subtle } from "@components/UI/Typography/Subtle.js";
 import {
   Control,
   DeepPartial,
+  DefaultValues,
   FieldValues,
   Path,
   SubmitHandler,
@@ -36,7 +37,8 @@ export interface DynamicFormProps<T extends FieldValues> {
   onSubmit: SubmitHandler<T>;
   submitType?: "onChange" | "onSubmit";
   hasSubmitButton?: boolean;
-  defaultValues?: DeepPartial<T>;
+  // defaultValues?: DeepPartial<T>;
+  defaultValues?: DefaultValues<T>;
   fieldGroups: {
     label: string;
     description: string;
diff --git a/src/pages/Map.tsx b/src/pages/Map.tsx
index 86d9246d..e0044d18 100644
--- a/src/pages/Map.tsx
+++ b/src/pages/Map.tsx
@@ -14,9 +14,9 @@ import {
   ZoomInIcon,
   ZoomOutIcon,
 } from "lucide-react";
-import maplibregl from "maplibre-gl";
 import { useCallback, useEffect, useState } from "react";
 import { Layer, Map as MapGL, Marker, Source, useMap } from "react-map-gl";
+import maplibre from "react-map-gl/maplibre";
 
 export const MapPage = (): JSX.Element => {
   const { nodes, waypoints } = useDevice();
@@ -117,7 +117,9 @@ export const MapPage = (): JSX.Element => {
           //   addWaypoint(waypoint);
           //   connection?.sendWaypoint(waypoint, "broadcast");
           // }}
-          mapLib={maplibregl}
+
+          // @ts-ignore
+          mapLib={maplibre}
           attributionControl={false}
           renderWorldCopies={false}
           maxPitch={0}