Slowly but surely fixing things