diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c
index 28707d8b..5459a4cd 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -509,6 +509,13 @@ bool_t ginputCalibrateMouse(uint16_t instance) {
 			MouseConfig.fnsavecal(instance, (const uint8_t *)&MouseConfig.caldata, sizeof(MouseConfig.caldata));
 			MouseConfig.flags |= FLG_CAL_SAVED;
 		}
+
+		// Clear the screen using the GWIN default background color
+		#if GFX_USE_GWIN
+			gdispClear(gwinGetDefaultBgColor());
+		#else
+			gdispClear(White);
+		#endif
 	
 		return TRUE;
 	#endif
diff --git a/src/gqueue/gqueue.c b/src/gqueue/gqueue.c
index 8b27bd41..f73c43df 100644
--- a/src/gqueue/gqueue.c
+++ b/src/gqueue/gqueue.c
@@ -103,7 +103,7 @@
 		pi = pqueue->head;
 		pqueue->head = pi->next;
 		pi->next = 0;
-		gfxSytemUnlock();
+		gfxSystemUnlock();
 		return pi;
 	}
 	void gfxQueueGSyncPut(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem) {
@@ -184,7 +184,7 @@
 		pi = pqueue->head;
 		pqueue->head = pi->next;
 		pi->next = 0;
-		gfxSytemUnlock();
+		gfxSystemUnlock();
 
 		gfxSemSignalI(&pi->sem);
 		gfxSemDestroy(&pi->sem);