CN - More fixes to get FBP working with most recent 'next'.