degradation fixes