diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/AdditionalFieldsEntry.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/AdditionalFieldsEntry.vue
index 827cbff828..5f77d405e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/AdditionalFieldsEntry.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/AdditionalFieldsEntry.vue
@@ -221,12 +221,11 @@ export default {
                             let av_match = av_categories.find(
                                 element => element.category_name == av_cat
                             );
-                            av_options[av_cat] = av_match.authorised_values.map(
-                                av => ({
+                            av_options.value[av_cat] =
+                                av_match.authorised_values.map(av => ({
                                     value: av.value,
                                     label: av.description,
-                                })
-                            );
+                                }));
                         });
 
                         // Iterate on available fields
@@ -253,7 +252,7 @@ export default {
                                         if (
                                             available_field.authorised_value_category_name
                                         ) {
-                                            let av_value = this.av_options[
+                                            let av_value = av_options.value[
                                                 available_field
                                                     .authorised_value_category_name
                                             ].filter(
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesKBARTImport.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesKBARTImport.vue
index ffe4650bb7..ff55220acd 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesKBARTImport.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesKBARTImport.vue
@@ -149,7 +149,7 @@ export default {
                 },
                 error => {}
             );
-            this.clearForm();
+            clearForm();
         };
         const clearForm = () => {
             file.value = {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsHome.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsHome.vue
index 19b090ed57..e4cb9f8df0 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsHome.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/UsageStatisticsReportsHome.vue
@@ -49,6 +49,7 @@ import ButtonSubmit from "../ButtonSubmit.vue";
 import { APIClient } from "../../fetch/api-client.js";
 import UsageStatisticsReportBuilder from "./UsageStatisticsReportBuilder.vue";
 import UsageStatisticsSavedReports from "./UsageStatisticsSavedReports.vue";
+import { $__ } from "../../i18n";
 
 export default {
     setup(props) {
@@ -66,8 +67,8 @@ export default {
             await client.usage_data_providers.getAll().then(
                 result => {
                     if (result.length === 0) {
-                        this.setError(
-                            this.$__(
+                        setError(
+                            $__(
                                 "No data providers have been created -  no report data will be available"
                             )
                         );
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/InfiniteScrollSelect.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/InfiniteScrollSelect.vue
index e5b1de7ecc..66020afff4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/InfiniteScrollSelect.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/InfiniteScrollSelect.vue
@@ -23,7 +23,7 @@
             {{ selectedOptionLabel }}
         </template>
         <template #list-footer>
-            <li v-show="hasNextPage && !this.search" ref="load">
+            <li v-show="hasNextPage && !search" ref="load">
                 {{ $__("Loading more options...") }}
             </li>
         </template>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItem.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItem.vue
index 5932a7e570..5c19f9bd95 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItem.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItem.vue
@@ -281,7 +281,7 @@ export default {
             let table_col = db_column.split(".");
             let table = table_col[0];
             let col = table_col[1];
-            let api_attribute = this.api_mappings[table][col] || col;
+            let api_attribute = api_mappings[table][col] || col;
             return table == "biblio" || table == "biblioitems"
                 ? item.value.biblio[api_attribute]
                 : item.value[api_attribute];
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItems.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItems.vue
index aec3a35df1..cbe7b315a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItems.vue
+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Preservation/TrainsFormAddItems.vue
@@ -193,7 +193,7 @@ export default {
             let table_col = db_column.split(".");
             let table = table_col[0];
             let col = table_col[1];
-            let api_attribute = this.api_mappings[table][col] || col;
+            let api_attribute = api_mappings[table][col] || col;
             return table == "biblio" || table == "biblioitems"
                 ? item.biblio[api_attribute]
                 : item[api_attribute];
@@ -273,7 +273,6 @@ export default {
             setWarning,
             loading,
             loaded,
-            api_mappings,
             train,
             items,
             train_items,