diff --git a/products/common.mk b/products/common.mk
index 114ea6b..d43894a 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -4,7 +4,7 @@
 PRODUCT_DEVICE := generic
 
 # Use edify for otapackage
-TARGET_OTA_SCRIPT_MODE = edify
+PRODUCT_SPECIFIC_DEFINES += TARGET_OTA_SCRIPT_MODE=edify
 
 # Add ROMManager build property
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -24,4 +24,4 @@
 PRODUCT_PACKAGE_OVERLAYS := vendor/cyanogen/overlay
 
 # Always run in insecure mode, enables root on user build variants
-ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
+#ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
diff --git a/vendorsetup.sh b/vendorsetup.sh
index ee39837..d3faf25 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,4 +1,4 @@
-add_lunch_combo cyanogen_passion-userdebug
-add_lunch_combo cyanogen_incredible-userdebug
-add_lunch_combo cyanogen_heroc-userdebug
-add_lunch_combo cyanogen_sholes-userdebug
+add_lunch_combo cyanogen_passion-eng
+add_lunch_combo cyanogen_incredible-eng
+add_lunch_combo cyanogen_heroc-eng
+add_lunch_combo cyanogen_sholes-eng