Fix building with the latest CheddarKit