Some tweaks for production