diff --git a/src/components/auth/AuthButtons.tsx b/src/components/auth/AuthButtons.tsx
index b79bbe3f..efcc246d 100644
--- a/src/components/auth/AuthButtons.tsx
+++ b/src/components/auth/AuthButtons.tsx
@@ -94,7 +94,7 @@ export function AuthButtons() {
           <Trophy className="mr-2 h-4 w-4" />
           <span>My Lists</span>
         </DropdownMenuItem>
-        <DropdownMenuItem onClick={() => navigate('/profile#settings')}>
+        <DropdownMenuItem onClick={() => navigate('/settings')}>
           <Settings className="mr-2 h-4 w-4" />
           <span>Settings</span>
         </DropdownMenuItem>
diff --git a/src/components/settings/NotificationsTab.tsx b/src/components/settings/NotificationsTab.tsx
index 043d5d70..2bdc0bce 100644
--- a/src/components/settings/NotificationsTab.tsx
+++ b/src/components/settings/NotificationsTab.tsx
@@ -62,10 +62,10 @@ export function NotificationsTab() {
 
       if (data) {
         if (data.email_notifications) {
-          setEmailNotifications(data.email_notifications as EmailNotifications);
+          setEmailNotifications(data.email_notifications as unknown as EmailNotifications);
         }
         if (data.push_notifications) {
-          setPushNotifications(data.push_notifications as PushNotifications);
+          setPushNotifications(data.push_notifications as unknown as PushNotifications);
         }
       } else {
         // Initialize preferences if they don't exist
@@ -84,8 +84,8 @@ export function NotificationsTab() {
         .from('user_preferences')
         .insert([{
           user_id: user.id,
-          email_notifications: emailNotifications,
-          push_notifications: pushNotifications
+          email_notifications: emailNotifications as any,
+          push_notifications: pushNotifications as any
         }]);
 
       if (error) throw error;
diff --git a/src/components/settings/PrivacyTab.tsx b/src/components/settings/PrivacyTab.tsx
index bef11e3e..6378da44 100644
--- a/src/components/settings/PrivacyTab.tsx
+++ b/src/components/settings/PrivacyTab.tsx
@@ -31,7 +31,7 @@ export function PrivacyTab() {
 
   const form = useForm<ProfilePrivacy & PrivacySettings>({
     defaultValues: {
-      privacy_level: profile?.privacy_level || 'public',
+      privacy_level: (profile?.privacy_level === 'friends' ? 'public' : profile?.privacy_level) || 'public',
       show_pronouns: profile?.show_pronouns || false,
       activity_visibility: 'public',
       search_visibility: true,
@@ -98,7 +98,7 @@ export function PrivacyTab() {
 
       setPreferences(defaultSettings);
       form.reset({
-        privacy_level: profile?.privacy_level || 'public',
+        privacy_level: (profile?.privacy_level === 'friends' ? 'public' : profile?.privacy_level) || 'public',
         show_pronouns: profile?.show_pronouns || false,
         ...defaultSettings
       });