Fix failing builds