Fixup CI failures from last commit