some fixes for production