Tweak for production