DFF: Fixes