Easier ways to control unexpected repairs