diff --git a/include/gwin/slider.h b/include/gwin/slider.h
index 412900a5..c7599b33 100644
--- a/include/gwin/slider.h
+++ b/include/gwin/slider.h
@@ -64,7 +64,7 @@ typedef struct GSliderDrawStyle_t {
 
 typedef void (*GSliderDrawFunction)(GHandle gh, bool_t isVertical, coord_t thumbpos, const GSliderDrawStyle *pstyle, void *param);
 
-// A slider window
+// A button window
 typedef struct GSliderObject_t {
 	GWindowObject		gwin;
 
@@ -154,11 +154,11 @@ void gwinSetSliderStyle(GHandle gh, const GSliderDrawStyle *pStyle);
 void gwinSliderDraw(GHandle gh);
 
 /**
- * @brief   Set the callback routine to perform a custom slider drawing.
+ * @brief   Set the callback routine to perform a custom button drawing.
  *
- * @param[in] gh		The window handle (must be a slider window)
- * @param[in] fn		The function to use to draw the slider
- * @param[in] param		A parameter to pass to the slider drawing function
+ * @param[in] gh		The window handle (must be a button window)
+ * @param[in] fn		The function to use to draw the button
+ * @param[in] param		A parameter to pass to the button drawing function
  *
  * @api
  */
@@ -168,7 +168,7 @@ void gwinSetSliderCustom(GHandle gh, GSliderDrawFunction fn, void *param);
  * @brief   Get the current slider position.
  * @return	The slider position
  *
- * @param[in] gh		The window handle (must be a slider window)
+ * @param[in] gh		The window handle (must be a button window)
  *
  * @note	The use of a listener to get the slider position is recommended if you
  * 			want continuous updates on the slider position.
@@ -192,7 +192,7 @@ void gwinSetSliderCustom(GHandle gh, GSliderDrawFunction fn, void *param);
 	 * @brief	Attach a mouse source
 	 * @details	Attach a mouse source to a slider
 	 *
-	 * @param[in] gh	The slider handle
+	 * @param[in] gh	The button handle
 	 * @param[in] gsh	The source handle
 	 *
 	 * @api
@@ -204,7 +204,7 @@ void gwinSetSliderCustom(GHandle gh, GSliderDrawFunction fn, void *param);
  * @brief	Standard slider drawing routines
  * @details	This routine is called to draw the standard slider.
  *
- * @param[in] gh			The slider handle
+ * @param[in] gh			The button handle
  * @param[in] isVertical	The slider is vertically oriented instead of horizontal
  * @param[in] thumbpos		The position of the slider (0..cx-1 or cy-1..0)
  * @param[in] pstyle		The current drawing style
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c
index 1164e78b..4ad32359 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -339,7 +339,7 @@ GSourceHandle ginputGetMouse(uint16_t instance) {
 		ginput_lld_mouse_init();
 
 		#if GINPUT_MOUSE_NEED_CALIBRATION
-			#if 0
+			#if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE
 				if (!MouseConfig.fnloadcal) {
 					MouseConfig.fnloadcal = ginput_lld_mouse_calibration_load;
 					MouseConfig.flags &= ~FLG_CAL_FREE;
@@ -548,11 +548,11 @@ void ginputSetMouseCalibrationRoutines(uint16_t instance, GMouseCalibrationSaveR
 			MouseConfig.flags &= ~FLG_CAL_FREE;
 		#if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE
 			if (!MouseConfig.fnloadcal) {
-				MouseConfig.fnloadcal = fnload;
+				MouseConfig.fnloadcal = ginput_lld_mouse_calibration_load;
 				MouseConfig.flags &= ~FLG_CAL_FREE;
 			}
 			if (!MouseConfig.fnsavecal)
-				MouseConfig.fnsavecal = fnsave;
+				MouseConfig.fnsavecal = ginput_lld_mouse_calibration_save;
 		#endif
 		if (MouseConfig.fnsavecal && (MouseConfig.flags & (FLG_CAL_OK|FLG_CAL_SAVED)) == FLG_CAL_OK) {
 			MouseConfig.fnsavecal(instance, (const uint8_t *)&MouseConfig.caldata, sizeof(MouseConfig.caldata));
diff --git a/src/gwin/slider.c b/src/gwin/slider.c
index 040f7367..034ba6b2 100644
--- a/src/gwin/slider.c
+++ b/src/gwin/slider.c
@@ -74,7 +74,7 @@ static void gwinSliderCallback(void *param, GEvent *pe) {
 
 			// We are tracking the mouse
 
-			// Test for slider up
+			// Test for button up
 			if ((pme->meta & GMETA_MOUSE_UP)) {
 				gsw->tracking = FALSE;
 
@@ -104,7 +104,7 @@ static void gwinSliderCallback(void *param, GEvent *pe) {
 			}
 
 			// If mouse down - track movement
-			if ((pme->current_sliders & GINPUT_MOUSE_BTN_LEFT))
+			if ((pme->current_buttons & GINPUT_MOUSE_BTN_LEFT))
 				trackSliderDraw(gh, pme->x-gh->x, pme->y-gh->y);
 
 			return;