fixes for production environment