more tweaks for production