Couple of production tweaks