Fix failing nightly tests