diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3901428..df9d6fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ include(CTest)
 include(GNUInstallDirs)
 
 if (NOT CMAKE_BUILD_TYPE)
-    message(STATUS "No build type selected, default to release")
-    set(CMAKE_BUILD_TYPE "release")
+    message(STATUS "No build type selected, default to RelWithDebInfo")
+    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8696f8e..72e3872 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: anbox
 Section: misc
 Priority: optional
 Maintainer: Simon Fels <morphis@gravedo.de>
-Build-Depends: debhelper (>= 7), dkms, dh-systemd
-Standards-Version: 3.9.7
+Build-Depends: debhelper (>= 9), dkms, dh-systemd
+Standards-Version: 4.1.3
 Homepage: http://anbox.io
 Vcs-Browser: https://github.com/anbox/anbox
 Vcs-Git: https://github.com/anbox/anbox.git
diff --git a/external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp b/external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp
deleted file mode 100644
index 8102470..0000000
Binary files a/external/android-emugl/host/libs/Translator/GLES_V2/.GLESv2Imp.cpp.swp and /dev/null differ
diff --git a/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
index c49d4b7..91ff0b1 100644
--- a/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
+++ b/external/android-emugl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
@@ -1048,8 +1048,10 @@ GL_APICALL void  GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params){
     if (ctx->glGetIntegerv(pname,params))
     {
         if (destroyCtx)
+        {
             deleteGLESContext(ctx);
             return;
+        }
     }
   
     bool es2 = ctx->getCaps()->GL_ARB_ES2_COMPATIBILITY;
diff --git a/external/android-emugl/host/tools/emugen/ApiGen.cpp b/external/android-emugl/host/tools/emugen/ApiGen.cpp
index fc6c031..f912cb5 100644
--- a/external/android-emugl/host/tools/emugen/ApiGen.cpp
+++ b/external/android-emugl/host/tools/emugen/ApiGen.cpp
@@ -1158,8 +1158,7 @@ int ApiGen::genDecoderImpl(const std::string &filename)
                         varoffset.c_str(),
                         varoffset.c_str(),
                         varoffset.c_str(),
-                        classname.c_str(),
-                        e->name().c_str()
+                        classname.c_str()
                         );
 
                 varoffset += " + 4";
diff --git a/external/android-emugl/host/tools/emugen/EntryPoint.cpp b/external/android-emugl/host/tools/emugen/EntryPoint.cpp
index cc3bef1..8f91c83 100644
--- a/external/android-emugl/host/tools/emugen/EntryPoint.cpp
+++ b/external/android-emugl/host/tools/emugen/EntryPoint.cpp
@@ -99,7 +99,7 @@ bool EntryPoint::parse(unsigned int lc, const std::string & str)
         std::string vartype, varname;
         if (!parseParameterDeclaration(field, &vartype, &varname, &error)) {
             fprintf(stderr,
-                    "line: %d: Parsing error in field <%s>\n",
+                    "line: %d: Parsing error in field <%s>, error: %s\n",
                     lc,
                     field.c_str(),
                     error.c_str());
diff --git a/scripts/clean-build.sh b/scripts/clean-build.sh
index d1041a4..3e1e766 100755
--- a/scripts/clean-build.sh
+++ b/scripts/clean-build.sh
@@ -56,8 +56,8 @@ cleanup
 mkdir build || rm -rf build/*
 cd build
 cmake ..
-make -j10
-make test
+VERBOSE=1 make -j10
+VERBOSE=1 make test
 cd ..
 
 cleanup