diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts
index 80d70451f..d457e4c05 100644
--- a/src/addons/calendar/services/calendar-helper.ts
+++ b/src/addons/calendar/services/calendar-helper.ts
@@ -164,23 +164,12 @@ export class AddonCalendarHelperProvider {
     formatEventData(event: AddonCalendarEvent | AddonCalendarEventBase | AddonCalendarGetEventsEvent): AddonCalendarEventToDisplay {
 
         const eventFormatted: AddonCalendarEventToDisplay = {
-            id: event.id!,
-            name: event.name,
-            eventtype: event.eventtype,
-            categoryid: event.categoryid,
-            groupid: event.groupid,
-            description: event.description,
-            location: 'location' in event? event.location : undefined,
-            timestart: event.timestart,
-            timeduration: event.timeduration,
-            eventcount: 'eventcount' in event? event.eventcount || 0 : 0,
+            ...event,
+            location: 'location' in event ? event.location : undefined,
+            eventcount: 'eventcount' in event ? event.eventcount || 0 : 0,
             repeatid: event.repeatid || 0,
-            // repeateditall: event.repeateditall,
-            userid: event.userid,
-            timemodified: event.timemodified,
             eventIcon: this.getEventIcon(event.eventtype),
             formattedType: AddonCalendar.getEventType(event),
-            modulename: event.modulename,
             format: 1,
             visible: 1,
             offline: false,
diff --git a/src/addons/mod/lti/services/handlers/module.ts b/src/addons/mod/lti/services/handlers/module.ts
index ea35c8d26..6ad46c087 100644
--- a/src/addons/mod/lti/services/handlers/module.ts
+++ b/src/addons/mod/lti/services/handlers/module.ts
@@ -78,7 +78,7 @@ export class AddonModLtiModuleHandlerService implements CoreCourseModuleHandler
                 CoreNavigator.navigateToSitePath(AddonModLtiModuleHandlerService.PAGE_NAME + routeParams, options);
             },
             buttons: [{
-                icon: 'link',
+                icon: 'fas-external-link-alt',
                 label: 'addon.mod_lti.launchactivity',
                 action: (event: Event, module: CoreCourseModule, courseId: number): void => {
                     // Launch the LTI.
diff --git a/src/addons/mod/url/services/handlers/module.ts b/src/addons/mod/url/services/handlers/module.ts
index 61d2cd90d..d30b3189c 100644
--- a/src/addons/mod/url/services/handlers/module.ts
+++ b/src/addons/mod/url/services/handlers/module.ts
@@ -107,7 +107,7 @@ export class AddonModUrlModuleHandlerService implements CoreCourseModuleHandler
             },
             buttons: [{
                 hidden: true, // Hide it until we calculate if it should be displayed or not.
-                icon: 'link',
+                icon: 'fas-link',
                 label: 'core.openmodinbrowser',
                 action: (event: Event, module: CoreCourseModule, courseId: number): void => {
                     openUrl(module, courseId);
diff --git a/src/core/classes/site.ts b/src/core/classes/site.ts
index a8a70f875..4ed56b553 100644
--- a/src/core/classes/site.ts
+++ b/src/core/classes/site.ts
@@ -125,6 +125,7 @@ export class CoreSite {
         public loggedOut?: boolean,
     ) {
         this.logger = CoreLogger.getInstance('CoreSite');
+        this.siteUrl = CoreUrlUtils.removeUrlParams(this.siteUrl); // Make sure the URL doesn't have params.
         this.setInfo(infos);
         this.calculateOfflineDisabled();
 
@@ -1460,7 +1461,7 @@ export class CoreSite {
 
         // Use the wwwroot returned by the server.
         if (config!.httpswwwroot) {
-            this.siteUrl = config!.httpswwwroot;
+            this.siteUrl = CoreUrlUtils.removeUrlParams(config!.httpswwwroot); // Make sure the URL doesn't have params.
         }
 
         return config!;