diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk
index c46fef8..64869ae 100644
--- a/BoardCommonConfig.mk
+++ b/BoardCommonConfig.mk
@@ -72,7 +72,7 @@ BOARD_HARDWARE_CLASS := hardware/samsung/cmhw
 # Graphics
 BOARD_EGL_CFG := device/samsung/galaxys2-common/configs/egl.cfg
 USE_OPENGL_RENDERER := true
-COMMON_GLOBAL_CFLAGS += -DFORCE_SCREENSHOT_CPU_PATH
+COMMON_GLOBAL_CFLAGS += -DFORCE_SCREENSHOT_CPU_PATH -DWORKAROUND_BUG_10194508
 
 # FIMG Acceleration
 BOARD_USES_FIMGAPI := true
diff --git a/common.mk b/common.mk
index 1a180e3..8fab5f4 100644
--- a/common.mk
+++ b/common.mk
@@ -118,6 +118,8 @@ PRODUCT_COPY_FILES += \
 # Graphics
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.opengles.version=131072 \
+    ro.zygote.disable_gl_preload=true \
+    ro.bq.gpu_to_cpu_unsupported=1 \
     debug.hwui.render_dirty_regions=false
 
 # RIL