diff --git a/Android.bp b/Android.bp
index 8d88e5f..fd6ef1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,7 +81,7 @@
         local_include_dirs: ["binder"],
         include_dirs: [
             "frameworks/native/aidl/binder",
-            "frameworks/base/core/java/android/os/incremental",
+            "frameworks/base/core/java",
         ],
         export_aidl_headers: true,
     },
diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index 88f7cad..df5fc88 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -320,13 +320,13 @@
         uint64_t free_bytes = 0;
         if (is_fs_cp) {
             statvfs(mnt_pnt.c_str(), &data);
-            free_bytes = data.f_bavail * data.f_frsize;
+            free_bytes = ((uint64_t) data.f_bavail) * data.f_frsize;
         } else {
             std::string bow_device = fs_mgr_find_bow_device(blk_device);
             if (!bow_device.empty()) {
                 std::string content;
                 if (android::base::ReadFileToString(bow_device + "/bow/free", &content)) {
-                    free_bytes = std::strtoul(content.c_str(), NULL, 10);
+                    free_bytes = std::strtoull(content.c_str(), NULL, 10);
                 }
             }
         }
diff --git a/vold_prepare_subdirs.cpp b/vold_prepare_subdirs.cpp
index 3a58b2e..d624d73 100644
--- a/vold_prepare_subdirs.cpp
+++ b/vold_prepare_subdirs.cpp
@@ -121,7 +121,7 @@
 }
 
 static bool prepare_apex_subdirs(struct selabel_handle* sehandle, const std::string& path) {
-    if (!prepare_dir(sehandle, 0700, 0, 0, path + "/apexdata")) return false;
+    if (!prepare_dir(sehandle, 0711, 0, 0, path + "/apexdata")) return false;
 
     auto dirp = std::unique_ptr<DIR, int (*)(DIR*)>(opendir("/apex"), closedir);
     if (!dirp) {
@@ -138,7 +138,7 @@
 
         if (strchr(name, '@') != NULL) continue;
 
-        if (!prepare_dir(sehandle, 0700, AID_SYSTEM, AID_SYSTEM, path + "/apexdata/" + name)) {
+        if (!prepare_dir(sehandle, 0771, AID_ROOT, AID_SYSTEM, path + "/apexdata/" + name)) {
             return false;
         }
     }