diff --git a/src/change.c b/src/change.c
index 527d2cc8c0..eadcfd0e24 100644
--- a/src/change.c
+++ b/src/change.c
@@ -156,7 +156,7 @@ static long next_listener_id = 0;
 
 // A flag that is set when any buffer listener housekeeping is required.
 // Currently the only condition is when a listener is marked for removal.
-static bool houskeeping_required;
+static bool housekeeping_required;
 
 /*
  * Remove a given listener_T entry from its containing list.
@@ -212,23 +212,23 @@ clean_listener_list(buf_T *buf, listener_T **list, bool all)
 }
 
 /*
- * Perform houskeeping tasks for buffer change listeners.
+ * Perform housekeeping tasks for buffer change listeners.
  *
- * This does nothing unless the "houskeeping_required" flag has been set.
+ * This does nothing unless the "housekeeping_required" flag has been set.
  */
     static void
 perform_listener_housekeeping(void)
 {
     buf_T	*buf;
 
-    if (houskeeping_required)
+    if (housekeeping_required)
     {
 	FOR_ALL_BUFFERS(buf)
 	{
 	    clean_listener_list(buf, &buf->b_listener, FALSE);
 	    clean_listener_list(NULL, &buf->b_sync_listener, FALSE);
 	}
-	houskeeping_required = FALSE;
+	housekeeping_required = FALSE;
     }
 }
 
@@ -453,9 +453,9 @@ f_listener_remove(typval_T *argvars, typval_T *rettv)
 	if (lnr != NULL)
 	{
 	    // Clear the ID to indicate that the listener is unused flag
-	    // houskeeping.
+	    // housekeeping.
 	    lnr->lr_id = 0;
-	    houskeeping_required = TRUE;
+	    housekeeping_required = TRUE;
 	    rettv->vval.v_number = 1;
 	    return;
 	}
diff --git a/src/insexpand.c b/src/insexpand.c
index 42da99ad66..214395f55e 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -2489,7 +2489,7 @@ ins_compl_has_autocomplete(void)
 }
 
 /*
- * Cacluate fuzzy score and sort completion matches unless sorting is disabled.
+ * Calculate fuzzy score and sort completion matches unless sorting is disabled.
  */
     static void
 ins_compl_fuzzy_sort(void)
diff --git a/src/version.c b/src/version.c
index 2dd8c9764a..a2f10f9114 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1848,
 /**/
     1847,
 /**/
diff --git a/src/wayland.c b/src/wayland.c
index 6d28cbc257..36ccf66682 100644
--- a/src/wayland.c
+++ b/src/wayland.c
@@ -738,7 +738,7 @@ wayland_prepare_read(void)
 }
 
 /*
- * Catch up on any qeueued events
+ * Catch up on any queued events
  */
     int
 wayland_update(void)
@@ -866,7 +866,7 @@ ex_wlrestore(exarg_T *eap)
 
 /*
  * Get a suitable data device manager from connection. "supported" should be
- * iniitialized to VWL_DATA_PROTOCOL_NONE beforehand. Returns NULL if there are
+ * initialized to VWL_DATA_PROTOCOL_NONE beforehand. Returns NULL if there are
  * no data device manager available with the required selection.
  */
     vwl_data_device_manager_T *