fixes for production deployment