diff --git a/src/components/server/CreateServerModal.tsx b/src/components/server/CreateServerModal.tsx
index ed8ab79..8ee4b54 100755
--- a/src/components/server/CreateServerModal.tsx
+++ b/src/components/server/CreateServerModal.tsx
@@ -97,7 +97,7 @@ export function CreateServerModal({ isOpen, onClose }: CreateServerModalProps) {
 					>
 						{isSubmitting ? (
 							<>
-								<LoadingSpinner className="h-4 w-4" />
+								<LoadingSpinner size="sm" />
 								Creating...
 							</>
 						) : (
diff --git a/src/components/ui/Modal.tsx b/src/components/ui/Modal.tsx
index b6c8955..6d42916 100755
--- a/src/components/ui/Modal.tsx
+++ b/src/components/ui/Modal.tsx
@@ -34,16 +34,19 @@ export function Modal({ isOpen, onClose, title, children, className }: ModalProp
 
 	return (
 		<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4">
-			<div className="absolute inset-0" onClick={onClose} />
+			<div className="absolute inset-0" onClick={onClose} aria-label="Close" />
 			<div
+				role="dialog"
+				aria-modal="true"
+				aria-labelledby="modal-title"
 				className={cn(
 					'relative w-full max-w-md rounded-lg border border-border bg-canvas p-6 shadow-xl',
 					className
 				)}
 			>
 				<div className="mb-4 flex items-center justify-between">
-					<h3 className="text-lg font-semibold text-primary">{title}</h3>
-					<button onClick={onClose} className="text-muted hover:text-primary">
+					<h3 id="modal-title" className="text-lg font-semibold text-primary">{title}</h3>
+					<button onClick={onClose} className="text-muted hover:text-primary" aria-label="Close modal">
 						×
 					</button>
 				</div>
diff --git a/src/lib/schemas/user.ts b/src/lib/schemas/user.ts
index cf39e04..3ccedb0 100755
--- a/src/lib/schemas/user.ts
+++ b/src/lib/schemas/user.ts
@@ -10,7 +10,7 @@ export type Permission = z.infer<typeof permissionSchema>;
 export const roleSchema = z.object({
 	id: z.uuid(),
 	name: z.string(),
-	permissions: z.array(permissionSchema)
+	permissions: z.array(permissionSchema).nullable()
 });
 
 export type Role = z.infer<typeof roleSchema>;