Add FC trigger, among other fixes