Fix failing steps