Fix CI problems