adds some fixes for production