diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 34a3c47..9eccede 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -61,7 +61,11 @@
 static const char* kHwServicemanagerReadyProperty = "hwservicemanager.ready";
 
 void waitForHwServiceManager() {
-    while (!WaitForProperty(kHwServicemanagerReadyProperty, "true", std::chrono::milliseconds::max())) {}
+    using std::literals::chrono_literals::operator""s;
+
+    while (!WaitForProperty(kHwServicemanagerReadyProperty, "true", 1s)) {
+        LOG(WARNING) << "Waited for hwservicemanager.ready for a second, waiting another...";
+    }
 }
 
 sp<IServiceManager> defaultServiceManager() {
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index c595bb2..125ce1a 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -30,6 +30,7 @@
     ],
     out: [
         "android/hidl/base/1.0/types.h",
+        "android/hidl/base/1.0/hwtypes.h",
         "android/hidl/base/1.0/IBase.h",
         "android/hidl/base/1.0/IHwBase.h",
         "android/hidl/base/1.0/BnHwBase.h",