Fix caf errors