diff --git a/moodle.config.json b/moodle.config.json
index 8ffef01a4..d345c5ec3 100644
--- a/moodle.config.json
+++ b/moodle.config.json
@@ -53,6 +53,7 @@
         "ro": "Română",
         "ru": "Русский",
         "sl": "Slovenščina",
+        "sq": "Shqip",
         "sr-cr": "Српски",
         "sr-lt": "Srpski",
         "sv": "Svenska",
diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index bfe8f04df..024d099aa 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -617,7 +617,7 @@ export class AddonCalendarHelperProvider {
         const eventCourse = (event.course && event.course.id) || event.courseid;
 
         // Show the event if it is from site home or if it matches the selected course.
-        return !!eventCourse && (eventCourse == CoreSites.getCurrentSiteHomeId() || eventCourse == courseId);
+        return !eventCourse || (eventCourse === CoreSites.getCurrentSiteHomeId() || eventCourse === courseId);
     }
 
     /**
diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index a3e2145f0..2d8ec7e07 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -166,7 +166,7 @@
 
                     <!-- Add or edit submission. -->
                     <div collapsible-footer *ngIf="loaded && !isSubmittedForGrading" [hidden]="selectedTab !== 'submission'" slot="fixed">
-                        <div class="list-item-limited-width adaptable-buttons-row" *ngIf="canEdit || canSubmit">
+                        <div class="list-item-limited-width" *ngIf="canEdit || canSubmit">
                             <ng-container *ngIf="canEdit">
                                 <ng-container *ngIf=" !unsupportedEditPlugins.length && !showErrorStatementEdit">
                                     <!-- If has offline data, show edit. -->
diff --git a/src/core/features/user/services/user-offline.ts b/src/core/features/user/services/user-offline.ts
index 8d10efa46..09d060685 100644
--- a/src/core/features/user/services/user-offline.ts
+++ b/src/core/features/user/services/user-offline.ts
@@ -15,6 +15,7 @@
 import { Injectable } from '@angular/core';
 
 import { CoreSites } from '@services/sites';
+import { CoreUtils } from '@services/utils/utils';
 import { makeSingleton } from '@singletons';
 import { PREFERENCES_TABLE_NAME, CoreUserPreferenceDBRecord } from './database/user';
 
@@ -33,7 +34,10 @@ export class CoreUserOfflineProvider {
     async getChangedPreferences(siteId?: string): Promise<CoreUserPreferenceDBRecord[]> {
         const site = await CoreSites.getSite(siteId);
 
-        return site.getDb().getRecordsSelect(PREFERENCES_TABLE_NAME, 'value != onlineValue');
+        return site.getDb().getRecordsSelect(
+            PREFERENCES_TABLE_NAME,
+            'value != onlinevalue OR onlinevalue IS NULL',
+        );
     }
 
     /**
@@ -64,8 +68,19 @@ export class CoreUserOfflineProvider {
         const record: Partial<CoreUserPreferenceDBRecord> = {
             name,
             value,
+            onlinevalue: onlineValue,
         };
 
+        if (onlineValue === undefined) {
+            // Keep online value already stored (if any).
+            const entry = await CoreUtils.ignoreErrors(
+                site.getDb().getRecord<CoreUserPreferenceDBRecord>(PREFERENCES_TABLE_NAME, { name }),
+                null,
+            );
+
+            record.onlinevalue = entry?.onlinevalue;
+        }
+
         await site.getDb().insertRecord(PREFERENCES_TABLE_NAME, record);
     }