Fix errors that cause CI builds to fail.