diff --git a/libs/gui/CleanSpec.mk b/libs/gui/CleanSpec.mk
index 0d08291..c062229 100644
--- a/libs/gui/CleanSpec.mk
+++ b/libs/gui/CleanSpec.mk
@@ -48,4 +48,4 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "libgui*" -print0 | xargs -0 rm -f)
-$(call add-clean-step, rm -rf $PRODUCT_OUT/obj/SHARED_LIBRARIES/libgui_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libgui_intermediates)
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index 31bfcd7..bbdef62 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -126,6 +126,10 @@
 	GLES2/gl2.cpp.arm 	\
 #
 
+ifneq (,$(filter manta, $(TARGET_DEVICE)))
+       LOCAL_CFLAGS += -DIS_MANTA
+endif
+
 LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL
 LOCAL_LDLIBS := -lpthread -ldl
 LOCAL_MODULE:= libGLESv2
diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp
index 2d0045e..cd70ac8 100644
--- a/opengl/libs/GLES2/gl2.cpp
+++ b/opengl/libs/GLES2/gl2.cpp
@@ -44,10 +44,18 @@
 #undef CALL_GL_API
 #undef CALL_GL_API_RETURN
 
+#ifdef IS_MANTA
+#define DEBUG_CALL_GL_API 1
+#else
 #define DEBUG_CALL_GL_API 0
+#endif
 #define DEBUG_PRINT_CALL_STACK_ON_ERROR 0
 #define SYSTRACE_CALL_GL_API 0
 
+#ifdef IS_MANTA
+#undef USE_FAST_TLS_KEY
+#endif
+
 #if USE_FAST_TLS_KEY
 
     #ifdef HAVE_ARM_TLS_REGISTER
@@ -91,7 +99,7 @@
         GLenum status = GL_NO_ERROR; \
         bool error = false; \
         while ((status = glGetError()) != GL_NO_ERROR) { \
-            ALOGD("[" #_api "] 0x%x", status); \
+            ALOGD("GL Error: [" #_api "] 0x%x", status); \
             error = true; \
         } \
         if (DEBUG_PRINT_CALL_STACK_ON_ERROR && error) { \