Final Vending tweaks