Tweaks for production test