diff --git a/elements/gentoo/bin/install-packages b/elements/gentoo/bin/install-packages
index 8f3d328f..e60cf5f8 100755
--- a/elements/gentoo/bin/install-packages
+++ b/elements/gentoo/bin/install-packages
@@ -58,9 +58,13 @@ function unfix_shm {
 
 function install_gentoo_packages {
     RUN_ONCE_SHM='1'
-    fix_shm
-    emerge $@
-    unfix_shm
+    if ! grep -q /dev/shm /proc/mounts; then
+        fix_shm
+        emerge $@
+        unfix_shm
+    else
+        emerge $@
+    fi
 }
 
 TEMP="$(getopt -o huem: -n ${SCRIPTNAME} -- ${@})"
diff --git a/elements/gentoo/environment.d/00-gentoo-distro-name.bash b/elements/gentoo/environment.d/00-gentoo-distro-name.bash
index 91e5606b..ebfb67a2 100755
--- a/elements/gentoo/environment.d/00-gentoo-distro-name.bash
+++ b/elements/gentoo/environment.d/00-gentoo-distro-name.bash
@@ -1,2 +1,2 @@
 export DISTRO_NAME=gentoo
-export GENTOO_PROFILE=$(eselect profile show | tail -n 1)
+export GENTOO_PROFILE=${GENTOO_PROFILE:-'default/linux/amd64/13.0'}