diff --git a/c-preload/compiler-wrapper b/c-preload/compiler-wrapper
index fb6c153b..0aede833 100755
--- a/c-preload/compiler-wrapper
+++ b/c-preload/compiler-wrapper
@@ -2,7 +2,7 @@
 
 export LD_PRELOAD=$(dirname $0)/libpreload.so
 export ALLOWED_FOR_CREATE=/tmp 
-export ALLOWED_FOR_READ=/usr/local/include:/usr/include:/usr/lib:/usr/msp430:/usr/arm-linux-gnueabi/include:/tmp:/opt/intel
+export ALLOWED_FOR_READ=/usr/local/include:/usr/include:/usr/lib:/usr/msp430:/usr/arm-linux-gnueabi/include:/tmp:/opt/intel:/opt/clang
 # Last-gasp limits
 ulimit -t 10 # CPU time in seconds
 ulimit -v 500000 # virtual RAM limit in K
diff --git a/etc/config/gcc-explorer.amazon.properties b/etc/config/gcc-explorer.amazon.properties
index 04ab932d..cc50a0a6 100644
--- a/etc/config/gcc-explorer.amazon.properties
+++ b/etc/config/gcc-explorer.amazon.properties
@@ -1,5 +1,5 @@
 # Settings overridden for Amazon EC2 instances that power http://gcc.godbolt.org/
-compileTimeoutMs=300
-compilers=/usr/bin/g++-4.4:/usr/bin/g++-4.5:/usr/bin/g++-4.6:/usr/bin/g++-4.7:/usr/bin/arm-linux-gnueabi-g++-4.5:/usr/bin/clang++:/usr/bin/avr-g++:/usr/bin/msp430-g++:/usr/bin/arm-linux-gnueabi-g++-4.6:/opt/intel/bin/icc:/usr/bin/g++-4.8
+compileTimeoutMs=2000
+compilers=/usr/bin/g++-4.4:/usr/bin/g++-4.5:/usr/bin/g++-4.6:/usr/bin/g++-4.7:/usr/bin/arm-linux-gnueabi-g++-4.5:/usr/bin/clang++:/usr/bin/avr-g++:/usr/bin/msp430-g++:/usr/bin/arm-linux-gnueabi-g++-4.6:/opt/intel/bin/icc:/usr/bin/g++-4.8:/opt/clang-3.2/bin/clang++:/opt/clang-3.3/bin/clang++
 compiler-wrapper=./c-preload/compiler-wrapper
-max-asm-size=262144
+max-asm-size=500000