Fix deals and product templates