diff --git a/client/arg.cpp b/client/arg.cpp
index 3a26dc459..674b3f31a 100644
--- a/client/arg.cpp
+++ b/client/arg.cpp
@@ -220,6 +220,7 @@ static bool is_argument_with_space(const char* argument)
         "-iwithprefixbefore",
         "--include-with-prefix-before",
         "-iwithsysroot"
+        "-index-store-path"
     };
 
     for(const char* const arg : arguments) {
@@ -548,11 +549,16 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
                        || str_equal("-isystem-after", a)
                        || str_equal("-ivfsoverlay", a)
                        || str_equal("-iwithprefix", a)
+                       || str_equal("-serialize-diagnostics", a)
+                       || str_equal("--serialize-diagnostics", a)
+                       || str_equal("-fmodules-validate-once-per-build-session", a)
+                       || str_startswith("-fbuild-session-file=", a)
                        || str_equal("--include-with-prefix", a)
                        || str_equal("--include-with-prefix-after", a)
                        || str_equal("-iwithprefixbefore", a)
                        || str_equal("--include-with-prefix-before", a)
-                       || str_equal("-iwithsysroot", a)) {
+                       || str_equal("-iwithsysroot", a)
+                       || str_equal("-index-store-path", a)) {
                 args.append(a, Arg_Local);
 
                 assert( is_argument_with_space( a ));
diff --git a/client/icecc-create-env.in b/client/icecc-create-env.in
index 4fea59c92..713b044ac 100755
--- a/client/icecc-create-env.in
+++ b/client/icecc-create-env.in
@@ -491,6 +491,10 @@ if test -n "$clang"; then
         touch $tempdir/fakeproc/proc/cpuinfo
         add_file $tempdir/fakeproc/proc/cpuinfo /proc/cpuinfo
     fi
+    # clang needs tmp directory when it used with "-fembed-bitcode"
+    mkdir -p $tempdir/fakevar/tmp
+    touch $tempdir/fakevar/tmp/DUMMY
+    add_file $tempdir/fakevar/tmp/DUMMY /var/tmp/DUMMY
 fi
 
 # Do not do any prefix stripping on extra files, they (e.g. clang plugins) are usually