diff --git a/src/app/_components/challenges/challenge-content-info.tsx b/src/app/_components/challenges/challenge-content-info.tsx
index 995ec59..144ee92 100644
--- a/src/app/_components/challenges/challenge-content-info.tsx
+++ b/src/app/_components/challenges/challenge-content-info.tsx
@@ -22,7 +22,7 @@ export default function ChallengeContentInfo({
 }: ChallengeContentInfo) {
   if (isSuccess) {
     return (
-      <div className="flex flex-col space-y-4 p-4">
+      <div className="mb-6 flex flex-col space-y-4 p-4 md:mb-0">
         <div className="space-x-2">
           <Badge
             className={cn(
diff --git a/src/app/_components/challenges/challenge-editor.tsx b/src/app/_components/challenges/challenge-editor.tsx
index 9361799..d0b635e 100644
--- a/src/app/_components/challenges/challenge-editor.tsx
+++ b/src/app/_components/challenges/challenge-editor.tsx
@@ -76,6 +76,7 @@ export default function ChallengeEditorWrapper({
           readOnly: solved,
           minimap: { enabled: false },
           automaticLayout: true,
+          contextmenu: false,
         }}
       />
     </div>
diff --git a/src/server/dao/challenges.ts b/src/server/dao/challenges.ts
index 2da8aff..a66961e 100644
--- a/src/server/dao/challenges.ts
+++ b/src/server/dao/challenges.ts
@@ -464,7 +464,7 @@ export async function solveChallenge(
 
     const isSolvedAlready = await db.query.app_solved_challenges.findFirst({
       columns: {
-        solved_challenge_uuid: true,
+        solved_challenge_foreign_uuid: true,
         solved_challenge_team_uuid: true,
       },
       where: and(
diff --git a/src/server/dao/team.ts b/src/server/dao/team.ts
index cfaf045..70158e7 100644
--- a/src/server/dao/team.ts
+++ b/src/server/dao/team.ts
@@ -240,8 +240,8 @@ export async function joinTeam(
 
     if (!team_from_team_name?.team_uuid) {
       throw new BaseError({
-        error_title: "Invalid team name.",
-        error_desc: "The provided team name is invalid.",
+        error_title: "Invalid team.",
+        error_desc: "Team does not exist.",
       });
     }