Fix issues to make CI pass again