diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index e7fdc8592..6c581d55b 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1173,8 +1173,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Meilleurs compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma div
 SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé
 SAVEDLG_WARNFILENAME;Le fichier sera nommé
 SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs
-SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profil de sortie
-SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, simule le rendu généré par le profile de sortie de l'outil ICM. Particulièrement utile pour simuler le rendu en sortie d'imprimante.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profil Imprimante
+SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, vous permet de simuler le rendu obtenu par votre imprimante en utilisant le profil Imprimante réglé dans Préférences > Gestion des couleurs.
 THRESHOLDSELECTOR_B;Bas
 THRESHOLDSELECTOR_BL;Bas-gauche
 THRESHOLDSELECTOR_BR;Bas-droite
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 16c75e001..0f51938a0 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1324,8 +1324,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h
 SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
 SAVEDLG_WARNFILENAME;File will be named
 SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
-SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile.
-SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs.
+SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the Printer profile.
+SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate the printer's output by using the Printer profile set in Preferences > Color Management.
 THRESHOLDSELECTOR_B;Bottom
 THRESHOLDSELECTOR_BL;Bottom-left
 THRESHOLDSELECTOR_BR;Bottom-right
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index 49ff4790e..dc4fe6ffb 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -501,7 +501,9 @@ public:
                )
                ||(
                    type==ICCStore::ProfileType::OUTPUT
-                   && (cmsGetDeviceClass(profile.second) == cmsSigDisplayClass || cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
+                   && (cmsGetDeviceClass(profile.second) == cmsSigDisplayClass
+                       || cmsGetDeviceClass(profile.second) == cmsSigInputClass
+                       || cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
                    && cmsGetColorSpace(profile.second) == cmsSigRgbData
                )
             ) {
diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index 053453adf..35b7735c8 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -669,12 +669,12 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
     #pragma omp parallel num_threads(numthreads)
 #endif
     {
-        float *mean = new float [9];
-        float *meanN = new float [9];
-        float *sigma = new float [9];
-        float *sigmaN = new float [9];
-        float *MaxP = new float [9];
-        float *MaxN = new float [9];
+        float mean[10];
+        float meanN[10];
+        float sigma[10];
+        float sigmaN[10];
+        float MaxP[10];
+        float MaxN[10];
 
         float** varhue = new float*[tileheight];
 
@@ -1247,12 +1247,6 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
 
         delete [] varchro;
 
-        delete [] mean;
-        delete [] meanN;
-        delete [] sigma;
-        delete [] sigmaN;
-        delete [] MaxP;
-        delete [] MaxN;
     }
 #ifdef _RT_NESTED_OPENMP
     omp_set_nested (oldNested);