more FFC fixes