diff --git a/frontend/nyaysetu-frontend/src/pages/judge/JudgeCaseWorkspace.jsx b/frontend/nyaysetu-frontend/src/pages/judge/JudgeCaseWorkspace.jsx
index d119dd70e..58b273dcc 100644
--- a/frontend/nyaysetu-frontend/src/pages/judge/JudgeCaseWorkspace.jsx
+++ b/frontend/nyaysetu-frontend/src/pages/judge/JudgeCaseWorkspace.jsx
@@ -1833,7 +1833,7 @@ function HearingsTab({ caseId, caseData }) {
                                 <label style={{ display: 'block', color: 'var(--text-secondary)', fontSize: '0.875rem', marginBottom: '0.5rem' }}>Duration</label>
                                 <select
                                     value={hearingData.durationMinutes}
-                                    onChange={e => setHearingData({ ...hearingData, durationMinutes: parseInt(e.target.value) })}
+                                    onChange={e => setHearingData({ ...hearingData, durationMinutes: parseInt(e.target.value, 10) })}
                                     style={{
                                         width: '100%', padding: '0.875rem', borderRadius: '0.75rem',
                                         background: 'var(--bg-glass)', border: 'var(--border-glass)',
diff --git a/frontend/nyaysetu-frontend/src/pages/lawyer/ClientChatPage.jsx b/frontend/nyaysetu-frontend/src/pages/lawyer/ClientChatPage.jsx
index 4d792eeae..ea581797b 100644
--- a/frontend/nyaysetu-frontend/src/pages/lawyer/ClientChatPage.jsx
+++ b/frontend/nyaysetu-frontend/src/pages/lawyer/ClientChatPage.jsx
@@ -114,7 +114,7 @@ export default function ClientChatPage() {
             const user = JSON.parse(localStorage.getItem('user'));
             const myId = user?.id;
             const response = await messageAPI.getMessages(caseId);
-            const fetchedMessages = response.data.map(msg => ({
+            const fetchedMessages = response.(data ?? []).map(msg => ({
                 id: msg.id,
                 sender: (msg.senderId == selectedContact?.id) ? 'client' : (msg.senderId === myId ? 'me' : 'client'), // Fallback to client if not me
                 text: msg.message,
diff --git a/frontend/nyaysetu-frontend/src/pages/litigant/VakilFriendPage.jsx b/frontend/nyaysetu-frontend/src/pages/litigant/VakilFriendPage.jsx
index 32a4d02b6..581beee4b 100644
--- a/frontend/nyaysetu-frontend/src/pages/litigant/VakilFriendPage.jsx
+++ b/frontend/nyaysetu-frontend/src/pages/litigant/VakilFriendPage.jsx
@@ -335,7 +335,7 @@ const {
         } catch (err) {
             console.error('Failed to send message:', err);
             if (err.response?.status === 429) {
-                const retryAfter = parseInt(err.response.headers['retry-after'] || '60');
+                const retryAfter = parseInt(err.response.headers['retry-after'] || '60', 10);
                 startCooldown(retryAfter);
                 setMessages(prev => [...prev, {
                     role: 'assistant',