fixes for production