Degrading repair fixes