Changes to customers and some tweaks for production.