Cleaned up current CI failures.