diff --git a/fingerprint/Android.mk b/fingerprint/Android.mk
index 5b7f7be..890f477 100644
--- a/fingerprint/Android.mk
+++ b/fingerprint/Android.mk
@@ -28,6 +28,7 @@ LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_MODULE := fingerprint.msm8953
 LOCAL_MODULE_TAGS := optional
 LOCAL_32_BIT_ONLY := true
+LOCAL_VENDOR_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/fingerprint/service_32/Android.mk b/fingerprint/service_32/Android.mk
index 27191d8..560b710 100644
--- a/fingerprint/service_32/Android.mk
+++ b/fingerprint/service_32/Android.mk
@@ -6,6 +6,7 @@ LOCAL_INIT_RC := android.hardware.biometrics.fingerprint@2.1-service_32.rc
 LOCAL_PROPRIETARY_MODULE := true
 LOCAL_32_BIT_ONLY := true
 LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := \
     ../../../../../hardware/interfaces/biometrics/fingerprint/2.1/default/BiometricsFingerprint.cpp \
     ../../../../../hardware/interfaces/biometrics/fingerprint/2.1/default/service.cpp
@@ -19,4 +20,4 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     android.hardware.biometrics.fingerprint@2.1
 
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_EXECUTABLE)
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 10fb4dc..d718b55 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -23,5 +23,6 @@ LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_SRC_FILES := lights.c
 LOCAL_MODULE := lights.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/vendor.prop b/vendor.prop
index b62aa85..97e0c4f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -2,6 +2,9 @@
 # system.prop for sanders
 #
 
+# Navigation bar In some GSI nav bar isn't enabled so force it
+qemu.hw.mainkeys=0
+
 # Audio
 audio.deep_buffer.media=true
 vendor.audio.offload.buffer.size.kb=64