production environment fixes