Add WF121, other minor adjustments