diff --git a/BasePlatform/v1/BasePlatform-i386.yaml b/BasePlatform/v1/BasePlatform-i386.yaml
index 0b799d8..cb31d79 100644
--- a/BasePlatform/v1/BasePlatform-i386.yaml
+++ b/BasePlatform/v1/BasePlatform-i386.yaml
@@ -9,6 +9,14 @@ runtime: org.freedesktop.Sdk
 runtime-version: "18.08"
 separate-locales: false
 
+inherit-extensions:
+    - org.freedesktop.Platform.GL
+    - org.freedesktop.Platform.Timezones
+    - org.freedesktop.Platform.GStreamer
+    - org.freedesktop.Platform.Icontheme
+    - org.gtk.Gtk3theme
+    - org.freedesktop.Platform.VAAPI.Intel
+    - org.freedesktop.Platform.html5-codecs
 modules:
     -   name: test-arch
         buildsystem: simple
diff --git a/BasePlatform/v1/BasePlatform-x86_64.yaml b/BasePlatform/v1/BasePlatform-x86_64.yaml
index 220991e..3dc8ddd 100644
--- a/BasePlatform/v1/BasePlatform-x86_64.yaml
+++ b/BasePlatform/v1/BasePlatform-x86_64.yaml
@@ -11,7 +11,6 @@ separate-locales: false
 
 inherit-extensions:
     - org.freedesktop.Platform.GL
-    - org.freedesktop.Platform.Locale
     - org.freedesktop.Platform.Timezones
     - org.freedesktop.Platform.GStreamer
     - org.freedesktop.Platform.Icontheme
diff --git a/BasePlatform/v1/BaseSdk-i386.yaml b/BasePlatform/v1/BaseSdk-i386.yaml
index ffed193..3d8ca26 100644
--- a/BasePlatform/v1/BaseSdk-i386.yaml
+++ b/BasePlatform/v1/BaseSdk-i386.yaml
@@ -9,6 +9,15 @@ runtime: org.freedesktop.Sdk
 runtime-version: "18.08"
 separate-locales: false
 
+inherit-extensions:
+    - org.freedesktop.Platform.GL
+    - org.freedesktop.Platform.Timezones
+    - org.freedesktop.Platform.GStreamer
+    - org.freedesktop.Platform.Icontheme
+    - org.gtk.Gtk3theme
+    - org.freedesktop.Platform.html5-codecs
+    - org.freedesktop.Sdk.Extension
+    - org.freedesktop.Platform.VAAPI.Intel
 modules:
     -   name: test-arch
         buildsystem: simple
diff --git a/BasePlatform/v1/BaseSdk-x86_64.yaml b/BasePlatform/v1/BaseSdk-x86_64.yaml
index 756776b..94cfad6 100644
--- a/BasePlatform/v1/BaseSdk-x86_64.yaml
+++ b/BasePlatform/v1/BaseSdk-x86_64.yaml
@@ -11,7 +11,6 @@ separate-locales: false
 
 inherit-extensions:
     - org.freedesktop.Platform.GL
-    - org.freedesktop.Sdk.Locale
     - org.freedesktop.Platform.Timezones
     - org.freedesktop.Platform.GStreamer
     - org.freedesktop.Platform.Icontheme
diff --git a/BasePlatform/v1/sdk/cross.yaml b/BasePlatform/v1/sdk/cross.yaml
index 39d8eb1..e548acf 100644
--- a/BasePlatform/v1/sdk/cross.yaml
+++ b/BasePlatform/v1/sdk/cross.yaml
@@ -167,7 +167,7 @@ modules:
             - cd build; make -j$FLATPAK_BUILDER_N_JOBS
             - cd build; make DESTDIR=/usr/tmp_stdcpp install
             - cp -rav /usr/tmp_stdcpp/usr/lib64/* /usr/lib64; rm -rfv /usr/tmp_stdcpp/usr/lib64
-            - rm -rav /usr/tmp_stdcpp/usr/share
+            - rm -rfv /usr/tmp_stdcpp/usr/share
             - cp -rav /usr/tmp_stdcpp/* /
             - rm -rfv /usr/tmp_stdcpp
     -   name: cross-gcc