diff --git a/src/lib/services/grid.service.ts b/src/lib/services/grid.service.ts
index fadb1c2a..2f9701b5 100644
--- a/src/lib/services/grid.service.ts
+++ b/src/lib/services/grid.service.ts
@@ -574,7 +574,7 @@ export class GridService {
 
       case 'swap':
         const item1 = updated.find(i => i.id === operation.itemId)
-        const item2 = updated.find(i => i.id === operation.targetPosition)
+        const item2 = updated.find(i => i.position === operation.targetPosition)
         if (item1 && item2) {
           const tempPos = item1.position
           item1.position = item2.position
diff --git a/src/lib/utils/jobUtils.ts b/src/lib/utils/jobUtils.ts
index ac9e6e68..0d285f7a 100644
--- a/src/lib/utils/jobUtils.ts
+++ b/src/lib/utils/jobUtils.ts
@@ -123,7 +123,7 @@ export function jobSupportsAccessories(job: Job | undefined): boolean {
  */
 export function getJobSkillSlotCount(job: Job | undefined): number {
 	if (!job) return 0
-	return job.row === 1 || job.row === '1' ? 3 : 4
+	return job.row === 1 ? 3 : 4
 }
 
 /**
@@ -253,7 +253,7 @@ export function validateSkillConfiguration(
 	}
 
 	// Check for Row 1 constraint
-	if ((job.row === 1 || job.row === '1') && skills[3]) {
+	if (job.row === 1 && skills[3]) {
 		errors.push('Row I jobs only support 3 skill slots')
 	}