cff: Fix some data types mismatching with their sources.
3 files changed