diff --git a/app/api/projects/[projectId]/members/route.ts b/app/api/projects/[projectId]/members/route.ts
index f65693f..751edfd 100644
--- a/app/api/projects/[projectId]/members/route.ts
+++ b/app/api/projects/[projectId]/members/route.ts
@@ -160,7 +160,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
             projectId,
         });
 
-        const invitationUrl = buildInvitationUrl(invitation.token, normalizedEmail);
+        const invitationUrl = buildInvitationUrl(invitation.token);
         void sendInvitationEmail({
             to: normalizedEmail,
             inviterName: session.user.name || 'A team member',
diff --git a/app/api/versions/[versionId]/comments/route.ts b/app/api/versions/[versionId]/comments/route.ts
index 31e049c..2369bbc 100644
--- a/app/api/versions/[versionId]/comments/route.ts
+++ b/app/api/versions/[versionId]/comments/route.ts
@@ -87,7 +87,7 @@ export async function GET(request: NextRequest, { params }: RouteParams) {
         const { searchParams } = new URL(request.url);
         const includeResolved = searchParams.get('includeResolved') !== 'false';
         const limit = Math.min(Math.max(1, parseInt(searchParams.get('limit') ?? '200', 10)), 500);
-        const offset = Math.max(0, parseInt(searchParams.get('offset') ?? '0', 10));
+        const offset = Math.min(Math.max(0, parseInt(searchParams.get('offset') ?? '0', 10)), 50000);
 
         const commentsFilter = {
             versionId,
diff --git a/app/api/workspaces/[workspaceId]/members/route.ts b/app/api/workspaces/[workspaceId]/members/route.ts
index c3adc0e..d80ebd3 100644
--- a/app/api/workspaces/[workspaceId]/members/route.ts
+++ b/app/api/workspaces/[workspaceId]/members/route.ts
@@ -206,7 +206,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) {
             workspaceId,
         });
 
-        const invitationUrl = buildInvitationUrl(invitation.token, normalizedEmail);
+        const invitationUrl = buildInvitationUrl(invitation.token);
         void sendInvitationEmail({
             to: normalizedEmail,
             inviterName: session.user.name || 'A team member',
diff --git a/app/invitations/accept/page.tsx b/app/invitations/accept/page.tsx
index 04f99c4..ad5c22a 100644
--- a/app/invitations/accept/page.tsx
+++ b/app/invitations/accept/page.tsx
@@ -6,7 +6,6 @@ import { acceptInvitationTokenForUser } from '@/lib/invitations';
 interface InvitationAcceptPageProps {
   searchParams: Promise<{
     token?: string;
-    email?: string;
   }>;
 }
 
diff --git a/lib/invitations.ts b/lib/invitations.ts
index c1f69ec..d233a1c 100644
--- a/lib/invitations.ts
+++ b/lib/invitations.ts
@@ -39,11 +39,10 @@ function scopeLabel(scope: InvitationScope): string {
   return scope === 'WORKSPACE' ? 'workspace' : 'project';
 }
 
-export function buildInvitationUrl(token: string, email: string): string {
+export function buildInvitationUrl(token: string): string {
   const baseUrl = process.env.NEXTAUTH_URL || 'http://localhost:3000';
   const url = new URL('/invitations/accept', baseUrl);
   url.searchParams.set('token', token);
-  url.searchParams.set('email', email);
   return url.toString();
 }